Merge branch 'qa' into 'master'

Qa

See merge request hep-benchmarks/hep-spec!75

.gitlab-ci.yml

@@ -59,7 +59,7 @@ build_multiarch_manifest:
         - X86_IMAGE=$CI_REGISTRY_IMAGE/hepspec-cc7-multiarch:x86_64-${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}}
         - ARM_IMAGE=$CI_REGISTRY_IMAGE/hepspec-cc7-multiarch:aarch64-${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}}
         - MULTIARCH_IMAGE=$CI_REGISTRY_IMAGE/hepspec-cc7-multiarch:${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}}
-        - echo "current commit is ${CI_COMMIT_SHA:0:8}"
+        - echo "current commit is ${CI_COMMIT_SHORT_SHA}"
         - echo "current branch is ${CI_COMMIT_BRANCH}"
         - echo "current tag is ${CI_COMMIT_TAG}"
         - echo "X86_IMAGE=${X86_IMAGE}"
@@ -68,7 +68,11 @@ build_multiarch_manifest:
         - echo "{\"experimental\":\"enabled\"}" > ~/.docker/config.json
         - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin gitlab-registry.cern.ch
         - docker manifest create ${MULTIARCH_IMAGE} --amend ${X86_IMAGE} --amend ${ARM_IMAGE}
-        - docker manifest push --purge ${MULTIARCH_IMAGE} 
+        - docker manifest push --purge ${MULTIARCH_IMAGE}
+        - MULTIARCH_IMAGE=$CI_REGISTRY_IMAGE/hepspec-cc7-multiarch:ci-${CI_COMMIT_SHORT_SHA}
+        - docker manifest create ${MULTIARCH_IMAGE} --amend ${X86_IMAGE} --amend ${ARM_IMAGE}
+        - docker manifest push --purge ${MULTIARCH_IMAGE}
+
     only:
       variables:
         - $CI_COMMIT_BRANCH =~ /^qa-.*$/
@@ -112,7 +116,7 @@ announce_prod_image:
 #######
 # x86
 #######
-t_hs06_64_x86:
+hs06_64_x86:
   extends: .template_test_qa
   variables:
     BMK: "hs06"
@@ -121,14 +125,14 @@ t_hs06_64_x86:
       - export BMK_SET="453.povray"
       - export SECRET_URL=${HS06URL}
 
-t_hs06_32_x86:
-  extends: t_hs06_64_x86
+hs06_32_x86:
+  extends: hs06_64_x86
   variables:
      BMK: "hs06"
      BMK_OPTION: "32"
 
-t_s17_x86:
-  extends: t_hs06_64_x86
+s17_x86:
+  extends: hs06_64_x86
   before_script:
       - export BMK="spec2017"
       - export BMK_SET="511.povray_r"
@@ -137,7 +141,7 @@ t_s17_x86:
 ##########
 # aarch64
 ##########
-t_hs06_64_aarch64:
+hs06_64_aarch64:
   extends: .template_test_qa
   tags:
      - hepspec-docker-arm-runner
@@ -148,15 +152,20 @@ t_hs06_64_aarch64:
       - export BMK_SET="453.povray"
       - export SECRET_URL=${HS06URL}
 
-t_s17_aarch64:
-  extends: t_hs06_64_aarch64
+s17_aarch64:
+  extends: hs06_64_aarch64
   before_script:
       - export BMK="spec2017"
       - export BMK_SET="511.povray_r"
       - export SECRET_URL=${SPEC2017URL}
 
-t_hs06_ext_arm_runner:
-  extends: t_hs06_64_aarch64
+##########
+# external
+##########
+
+hs06_ext_arm_runner:
+  extends: hs06_64_aarch64
+  needs: []
   tags:
     - docker-arm-graviton2
   image: 
@@ -165,8 +174,9 @@ t_hs06_ext_arm_runner:
     variables:
       - $CI_COMMIT_TAG =~ /^external.*$/
 
-t_s17_ext_runner:
-  extends: t_s17_aarch64
+s17_ext_runner:
+  extends: s17_aarch64
+  needs: []
   tags:
     - docker-arm-graviton2
   only:  
@@ -176,7 +186,7 @@ t_s17_ext_runner:
 ############################################################
 #####              TEST QA SINGULARITY                 #####
 ############################################################
-t_singularity_hs06:
+t_sing_hs06:
     extends: .template_test_singularity_qa_image
     tags:
       -  hepspec-docker-runner
@@ -185,7 +195,7 @@ t_singularity_hs06:
       - export BMK_SET="453.povray"
       - export SECRET_URL=${HS06URL}
 
-t_singularity_s17:
+t_sing_s17:
     extends: .template_test_singularity_qa_image
     tags:
       -  hepspec-docker-runner

ci_templates.yml

@@ -66,7 +66,9 @@
     # then runs a configurable set of benchmarks 
     stage: test-image
     image: 
-      name: $CI_REGISTRY_IMAGE/hepspec-cc7-multiarch:${CI_COMMIT_BRANCH}
+      # Using ${CI_COMMIT_SHORT_SHA} to reference the image tag, instead of ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}}
+      # because at container start the condition ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}} is not evaluted
+      name: $CI_REGISTRY_IMAGE/hepspec-cc7-multiarch:ci-${CI_COMMIT_SHORT_SHA}
       entrypoint: [""]
     tags: 
       -  hepspec-docker-runner