Simplify

.gitlab-ci.yml

@@ -26,7 +26,8 @@ before_script:
         - echo ${CI_PROJECT_DIR}/${CONTEXT_DIR}/
         - ls -alh ${CI_PROJECT_DIR}/${CONTEXT_DIR}/
         - echo "Logging into the registry ${CI_REGISTRY}"
-        - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"username\":\"${CI_REGISTRY_USER}\",\"password\":\"${CI_REGISTRY_PASSWORD}\"}}}" > /kaniko/.docker/config.json
+        #- echo "{\"auths\":{\"${CI_REGISTRY}\":{\"username\":\"${CI_REGISTRY_USER}\",\"password\":\"${CI_REGISTRY_PASSWORD}\"}}}" > /kaniko/.docker/config.json
+        - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"username\":\"${DOCKER_USERNAME}\",\"password\":\"${DOCKER_PASSWORD}\"}}}" > /kaniko/.docker/config.json
         - echo "Building standalone image ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CMSSW_VERSION}-${DATE}-${CI_COMMIT_SHORT_SHA} with ${CMSSW_VERSION} and ${SCRAM_ARCH}" on ${DATE}
         - /kaniko/executor --context ${CI_PROJECT_DIR}/${CONTEXT_DIR} --dockerfile ${CI_PROJECT_DIR}/${CONTEXT_DIR}/Dockerfile --destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CMSSW_VERSION}-${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="${CMSSW_VERSION}"
 

standalone/.gitlab-ci.yml

-build_TreeMaker_cmssw_standalone_CMSSW_10_2_21:
-    extends: .job_template
-    variables:
-        CMSSW_VERSION: CMSSW_10_2_21
-        SCRAM_ARCH: slc7_amd64_gcc700
-        BASE_IMAGE: clelange/cc7-cms:latest
+#build_TreeMaker_cmssw_standalone_CMSSW_10_2_21:
+#    extends: .job_template
+#    variables:
+#        CMSSW_VERSION: CMSSW_10_2_21
+#        SCRAM_ARCH: slc7_amd64_gcc700
+#        BASE_IMAGE: clelange/cc7-cms:latest
 
 build_TreeMaker_cmssw_standalone_CMSSW_10_2_21_dockerhub:
     extends: .job_template