From 7d0318e16714ef81cf8ab93f3d84740c7a4dc244 Mon Sep 17 00:00:00 2001 From: Vineet Reddy Rajula <rajula.vineet.reddy@cern.ch> Date: Mon, 19 Jul 2021 09:44:54 +0200 Subject: [PATCH] Update CI --- .gitlab-ci.yml | 51 +++++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c48d792..aa7a8c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,37 +1,24 @@ stages: - build -.build: +build: stage: build - image: - name: gitlab-registry.cern.ch/ci-tools/docker-image-builder - entrypoint: [""] + image: + # We recommend using the CERN version of the Kaniko image: gitlab-registry.cern.ch/ci-tools/docker-image-builder + 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 $IMAGE_DESTINATION - - echo "Image pushed successfully to ${IMAGE_DESTINATION}" - - -##################################################### -################### Merge Requests ################## - -build_mr: - extends: .build - variables: - IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:${CI_COMMIT_REF_SLUG} - rules: - - if: $CI_MERGE_REQUEST_ID - when: manual - allow_failure: true - - when: never - -###################################################### -#################### Master branch ################### - -build_master: - extends: .build - variables: - IMAGE_DESTINATION: ${CI_REGISTRY_IMAGE}/openshift-cli:latest - rules: - - if: $CI_COMMIT_BRANCH == 'master' - - when: never + - | + case "$CI_COMMIT_BRANCH" in + v*) export DATE=$(date -u +%Y.%m.%dT%H-%M-%SZ); export TAG="RELEASE"-${DATE}; echo "TAG=$TAG" >> build.env ;; + *) export TAG=$CI_COMMIT_SHORT_SHA ;; + esac + - wget --no-check-certificate https://github.com/mikefarah/yq/releases/download/v4.2.0/yq_linux_amd64 -O /yq && chmod +x /yq + # This is not the common Authentication config, unknown reason why common config fails + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json + # Image builder + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination ${CI_REGISTRY_IMAGE}/velero-restore:${CI_COMMIT_BRANCH}-${TAG} + - echo "Image pushed successfully to ${CI_REGISTRY_IMAGE}/velero-restore:${CI_COMMIT_BRANCH}-${TAG}" + artifacts: + reports: + dotenv: build.env -- GitLab