Merge branch 'ci' into 'master'

CI two build templates

See merge request cms-cloud/cmssw-docker!15

.gitlab-ci.yml

@@ -13,7 +13,7 @@ check_changed_files:
   script:
     - ./check.sh
 
-.build_image_template: &build_image
+.build_cms_cvmfs_template: &build_cms_cvmfs
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -21,21 +21,36 @@ check_changed_files:
     - export DATE=$(date +"%Y-%m-%d")
     - echo "Pipeline source - $CI_PIPELINE_SOURCE"
     - echo "Building image - $IMAGE_NAME"
-    - printf "Release - $RELEASE\nScram Arch - $SCRAM_ARCH\nBase image - $BASE_IMAGE\n"
+    - export DOCKER_AUTH="$(echo -n $DOCKER_USER:$DOCKER_PASS | base64)"
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}, \"$DOCKER_REGISTRY\":{\"auth\":\"${DOCKER_AUTH}\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR/$IMAGE_NAME --dockerfile $CI_PROJECT_DIR/$IMAGE_NAME/Dockerfile --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$DATE-$CI_COMMIT_SHORT_SHA --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest --destination  $DOCKER_GROUP/$IMAGE_NAME:latest --build-arg=BUILD_DATE="$DATE" --build-arg=VERSION="$DATE" --build-arg=VCS_URL="$CI_REPOSITORY_URL" --build-arg=VCS_REF="$CI_COMMIT_SHORT_SHA"
+
+.build_standalone_template: &build_standalone
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - export DATE=$(date +"%Y-%m-%d")
+    - export RELEASE_CAP=$(echo $RELEASE | tr '[:lower:]' '[:upper:]')
+    - echo "Pipeline source - $CI_PIPELINE_SOURCE"
+    - echo "Building image - $IMAGE_NAME"
+    - printf "Release - $RELEASE_CAP\nScram Arch - $SCRAM_ARCH\nBase image - $BASE_IMAGE\n"
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR/$REPO_NAME --dockerfile $CI_PROJECT_DIR/$REPO_NAME/Dockerfile --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:${IMAGE_TAG}$DATE-$CI_COMMIT_SHORT_SHA --build-arg=BUILD_DATE="$DATE" --build-arg=VERSION="$DATE" --build-arg=VCS_URL="$CI_REPOSITORY_URL" --build-arg=VCS_REF="$CI_COMMIT_SHORT_SHA" --build-arg BASEIMAGE="$BASE_IMAGE" --build-arg SCRAM_ARCH="$SCRAM_ARCH" --build-arg CMSSW_VERSION="$RELEASE"
+    - /kaniko/executor --context $CI_PROJECT_DIR/$REPO_NAME --dockerfile $CI_PROJECT_DIR/$REPO_NAME/Dockerfile --destination $CI_REGISTRY_IMAGE/$IMAGE_NAME:$DATE-$CI_COMMIT_SHORT_SHA --build-arg=BUILD_DATE="$DATE" --build-arg=VERSION="$DATE" --build-arg=VCS_URL="$CI_REPOSITORY_URL" --build-arg=VCS_REF="$CI_COMMIT_SHORT_SHA" --build-arg BASEIMAGE="$BASE_IMAGE" --build-arg SCRAM_ARCH="$SCRAM_ARCH" --build-arg CMSSW_VERSION="$RELEASE_CAP"
+
 
 build_cms_cvmfs_pipeline:
-  <<: *build_image
+  <<: *build_cms_cvmfs
   stage: build
   only:
     variables:
       - $IMAGE_NAME
   variables:
-    REPO_NAME: $IMAGE_NAME
+    DOCKER_GROUP: cmscloud
+    DOCKER_REGISTRY: https://index.docker.io/v1/
 
 build_standalone_pipeline:
-  <<: *build_image
+  <<: *build_standalone
   stage: build
   only:
     variables:
@@ -43,7 +58,6 @@ build_standalone_pipeline:
   tags:
     - docker-privileged-xl
   variables:
-    IMAGE_NAME: cmssw
+    IMAGE_NAME: $RELEASE-$SCRAM_ARCH
     REPO_NAME: standalone
-    IMAGE_TAG: $RELEASE-$SCRAM_ARCH-
     BASE_IMAGE: "clelange/$OS-cms:latest"
\ No newline at end of file