Simplify archive.gitlab-ci.yml

Merge some trivially inherited jobs.

Change-Id: Id0a3a998bf5fa3f08db0dccb7da1aadb4f2902a0

diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml
index a41d6c5d90c3f5576403293458109595883e4130..4070608f009104fb54b3ad3658beb35a44264fa1 100644 (file)
--- a/admin/gitlab-ci/archive.gitlab-ci.yml
+++ b/admin/gitlab-ci/archive.gitlab-ci.yml
@@ -1,6 +1,9 @@
 # Packages, exported artifacts, and release engineering processes.
 
-.release-version-template:
+prepare-release-version:
+  extends:
+    - .variables:default
+  cache: {}
   # Docker image uploaded to dockerhub by user eriklindahl
   # TODO: Get DockerFile for admin/dockerfiles
   image: biophysics/gcc-gromacs
@@ -25,15 +28,13 @@
     paths:
       - version.json
 
-prepare-release-version:
-  extends:
-    - .regressiontests-prepare-extends-template
-    - .release-version-template
-
 # Special job to package regressiontest files and have them available for testing
 # Runs during pre-build
 # Set up to only fetch the files and prepare everything for merge requests
-.regressiontests-template:
+prepare-regressiontests:
+  extends:
+    - .variables:default
+  cache: {}
   image: biophysics/gcc-gromacs
   stage: configure-build
 
@@ -72,7 +73,10 @@ prepare-release-version:
     paths:
       - gmx-regressiontests.tar.gz
 
-.regressiontests-release-template:
+package-regressiontests-release:
+  extends:
+    - .variables:default
+  cache: {}
   # Docker image uploaded to dockerhub by user eriklindahl
   # TODO: Get DockerFile for admin/dockerfiles
   image: biophysics/gcc-gromacs
@@ -82,11 +86,14 @@ prepare-release-version:
     KUBERNETES_CPU_LIMIT: 1
     KUBERNETES_CPU_REQUEST: 1
     KUBERNETES_MEMORY_LIMIT: 2Gi
+  needs:
+    - job: prepare-release-version
+      artifacts: true
   only:
     refs:
+      - triggers
       - web
       - schedules
-      - triggers
     variables:
       - $GROMACS_RELEASE
   script:
@@ -119,31 +126,6 @@ prepare-release-version:
     paths:
       - regressiontests-*.tar.gz
 
-.regressiontests-prepare-extends-template:
-  extends:
-    - .variables:default
-  cache: {}
-
-prepare-regressiontests:
-  extends:
-    - .regressiontests-prepare-extends-template
-    - .regressiontests-template
-
-package-regressiontests-release:
-  extends:
-    - .regressiontests-prepare-extends-template
-    - .regressiontests-release-template
-  needs:
-    - job: prepare-release-version
-      artifacts: true
-  only:
-    refs:
-      - triggers
-      - web
-      - schedules
-    variables:
-      - $GROMACS_RELEASE
-
 configure-archive-nightly:
   stage: nightly-configure
   only:
@@ -184,9 +166,14 @@ configure-archive-release:
 # and the ccache files out of the build archive, as it is not possible to use
 # the custom build directory due to https://gitlab.com/gitlab-org/gitlab-runner/issues/4203
 # As soon as this is resolved we should use the separate build directories instead of
-# manually hacking things. TODO
-# Redmine #3361
-.archive-build-template:
+# manually hacking things. TODO: #3361
+.build-archive:
+  extends:
+    - .gromacs:base:build
+    - .use-ccache
+    - .variables:default
+    - .documentation-before-script-template
+    - .build-docs-binary-template
   # Dockerfiles are from dockerhub, user eriklindahl
   image: gromacs/ci-docs-clang:master
   only:
@@ -236,15 +223,6 @@ configure-archive-release:
       - $BUILD_DIR/*log
       - gromacs*tar.gz
 
-.build-archive:
-  extends:
-    - .gromacs:base:build
-    - .use-ccache
-    - .variables:default
-    - .documentation-before-script-template
-    - .build-docs-binary-template
-    - .archive-build-template
-
 build-archive-nightly:
   extends:
     - .build-archive
@@ -281,9 +259,12 @@ package-archive-release:
   variables:
     BUILD_DIR: build-package
 
-.release-verify-template:
+release-verify:
   image: biophysics/gcc-gromacs
   stage: release-verify
+  extends:
+    - .variables:default
+  cache: {}
 
   variables:
     KUBERNETES_CPU_LIMIT: 1
@@ -292,9 +273,9 @@ package-archive-release:
 
   only:
     refs:
-      - merge_requests
-      - schedules
+      - triggers
       - web
+      - schedules
     variables:
       - $GROMACS_RELEASE
   script:
@@ -318,18 +299,6 @@ package-archive-release:
       echo "Mismatch in regressiontest md5sums";
       exit 1;
       fi
-
-release-verify:
-  extends:
-    - .regressiontests-prepare-extends-template
-    - .release-verify-template
-  only:
-    refs:
-      - triggers
-      - web
-      - schedules
-    variables:
-      - $GROMACS_RELEASE
   dependencies:
     - package-archive-release
     - package-regressiontests-release