Use docker builder

.gitlab-ci.yml

@@ -2,45 +2,32 @@
 stages:
   - build
   - test
+  - tag
 
-dockermaster:
-    stage: build
-    image:
-        name: gitlab-registry.cern.ch/ci-tools/docker-image-builder
-        entrypoint: [""]
-    script:
-        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE
-    only:
-        - master
+build_image:
+  stage: build
+  trigger:
+    include:
+      - project: 'ci-tools/docker-builder'
+        file: '/ci.yml'
+    strategy: depend
 
-docker:
-    stage: build
-    image:
-        name: gitlab-registry.cern.ch/ci-tools/docker-image-builder
-        entrypoint: [""]
-    script:
-        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-    except:
-        - master
-
-testmaster:
+test_image:
    stage: test
-   image: $CI_REGISTRY_IMAGE
+   image: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
    script:
        - echo "${IMAGECI_PWD}" | kinit ${IMAGECI_USER}@CERN.CH
        - export OS_PROJECT_NAME="IT Linux Support - CI VMs"
        - openstack image list
-   only:
-       - master
 
-test:
-   stage: test
-   image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-   script:
-       - echo "${IMAGECI_PWD}" | kinit ${IMAGECI_USER}@CERN.CH
-       - export OS_PROJECT_NAME="IT Linux Support - CI VMs"
-       - openstack image list
-   except:
-       - master
+tag_image:
+  stage: tag
+  image: gitlab-registry.cern.ch/ci-tools/docker-builder/tools
+  variables:
+    NEWTAG: latest
+  script:
+    - /kaniko/auth.sh
+    - crane validate --remote "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+    - crane tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$NEWTAG"
+  only:
+    - master