Merge branch 'simplify' into 'master'

New build method

See merge request linuxsupport/cronjobs/centos_rss!6

.gitlab-ci.yml

@@ -2,29 +2,8 @@
 include: 'https://gitlab.cern.ch/linuxsupport/cronjobs/base/raw/master/gitlab-ci.yml'
 
 build_centos_rss:
-  stage: build
-  tags:
-    - docker-image-build
-  script: "echo" # unused but this line is required by GitLab CI
+  extends: .build_image
   variables:
     CONTEXT_DIR: centos_rss
-    TO: $CI_REGISTRY_IMAGE/centos_rss:$CI_COMMIT_REF_NAME
-
-deploy:
-  extends: .nomad
-  stage: deploy
-  script:
-    - for j in *.nomad; do echo -e "\n${j}:"; nomad job run <(envsubst < $j); done
-  only:
-    - tags
-    - master
-
-deploy_dev:
-  extends: .nomad
-  stage: deploy
-  script:
-    - for j in *.nomad; do echo -e "\n${j}:"; nomad job run <(envsubst < $j); done
-  except:
-    - tags
-    - master
-  when: manual
+    DOCKER_FILE: centos_rss/Dockerfile
+    TO: $CI_REGISTRY_IMAGE/centos_rss

centos_rss.nomad

@@ -13,8 +13,7 @@ job "${PREFIX}_centos_rss" {
     driver = "docker"
 
     config {
-      image = "https://gitlab-registry.cern.ch/linuxsupport/cronjobs/centos_rss/centos_rss:${CI_COMMIT_REF_NAME}"
-      force_pull = ${FORCE_PULL}
+      image = "https://gitlab-registry.cern.ch/linuxsupport/cronjobs/centos_rss/centos_rss:${CI_COMMIT_SHORT_SHA}"
       logging {
         config {
           tag = "${PREFIX}_centos_rss"