Merge branch 'policy-tags' into 'qa'

Policy tags

See merge request !24

.gitlab-ci.yml

@@ -49,7 +49,7 @@ patatrack:
   only:
     variables:
       - $CI_COMMIT_BRANCH =~ /^qa.*$/
-      - $CI_COMMIT_TAG =~ /^v.*$/
+      - $CI_COMMIT_TAG =~ /^cms-patatrack-v.*$/
     changes:
       - cms/patatrack/*
       - cms/patatrack/ci-scripts/*
@@ -68,7 +68,7 @@ simpletrack:
   only:
     variables:
     - $CI_COMMIT_BRANCH =~ /^qa.*$/
-    - $CI_COMMIT_TAG =~ /^v.*$/
+    - $CI_COMMIT_TAG =~ /^simpletrack-v.*$/
     changes:
     - lhc/simpletrack/Dockerfile.*
     - lhc/simpletrack/lhc-simpletrack.*

cms/cms-patatrack-ci.yml

@@ -170,6 +170,6 @@ job_test_standalone_image:
             - cms/patatrack/cms-patatrack/utility_scripts/*
     artifacts:
         paths:
-            - ${CI_PROJECT_DIR}/${RESULTS_DIR}
+            - ${CI_PROJECT_DIR}/CI-JOB-${CI_JOB_ID}
         expire_in: 1 week
         when: always
\ No newline at end of file

lhc/simpletrack/.simpletrack-ci.yml

@@ -16,7 +16,7 @@ stages:
     name: build/$CI_COMMIT_REF_NAME
   before_script:
   - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-  - export HEP_LATEST="latest"; export HEP_TAG=$CI_COMMIT_TAG; if [ "$CI_COMMIT_REF_NAME" == "qa" ]; then export HEP_LATEST=`echo ci-${CI_COMMIT_REF_NAME}-latest` ; export HEP_TAG=`echo "ci"-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}`; fi
+  - export HEP_LATEST="latest"; export HEP_TAG=`echo ${CI_COMMIT_TAG} | sed -e 's@.*-\(v[0-9\.]*\)@\1@'`; if [ "$CI_COMMIT_REF_NAME" == "qa" ]; then export HEP_LATEST=`echo ci-${CI_COMMIT_REF_NAME}-latest` ; export HEP_TAG=`echo "ci"-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}`; fi
 
 .job_template: &job_test
   stage: test