Merge branch 'fix/change-test-image-tag-structure' into 'develop'

Update tag structure for cleanbot

See merge request ProtonVPN/linux/proton-python-client!41

Author: Alexandru Cheltuitor

.gitlab-ci.yml

@@ -72,7 +72,7 @@ make-image-arch:
 ######### CI Test Jobs ##########
 test-deb:
  stage: test
- image: $CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG-ubuntu
+ image: $CI_REGISTRY_IMAGE/ubuntu:branch-$CI_COMMIT_REF_SLUG
  interruptible: true
  needs:
    - job: make-image-deb
@@ -83,13 +83,13 @@ test-rpm:
  extends: test-deb
  needs:
    - job: make-image-rpm
- image: $CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG-fedora
+ image: $CI_REGISTRY_IMAGE/fedora:branch-$CI_COMMIT_REF_SLUG
 
 test-arch:
  extends: test-deb
  needs:
    - job: make-image-arch
- image: $CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG-archlinux
+ image: $CI_REGISTRY_IMAGE/archlinux:branch-$CI_COMMIT_REF_SLUG
 
 
 ## Jobs to publish commits + tags from master to github

Makefile

@@ -4,8 +4,8 @@
 
 branch ?= master
 DOCKERFILE_BUILD=/tmp/Dockerfile.image
-NAME_IMAGE ?= "$(CI_REGISTRY_IMAGE)"
-TAG_IMAGE := branch-$(subst /,-,$(branch))-$(src)
+NAME_IMAGE ?= "$(CI_REGISTRY_IMAGE)/$(src)"
+TAG_IMAGE := branch-$(subst /,-,$(branch))
 
 # We use :latest so we can use somewhere else, but it's the same as branch-master the other one is for CI
 ifeq ($(branch), latest)