Merge .regressiontest-template.yml into archive config.

Change-Id: I0659399f4ec9e4e3a651e5f6818e56ed1820ee62

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6996fc69fc878993d03a00057c76b7ef5da293b..ee7bc49d055545824684c4cfe8659d98cce93f09 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,6 @@ include:
   - local: '/admin/ci-templates/.test-script-template.yml'
   - local: '/admin/ci-templates/.cuda-template.yml'
   - local: '/admin/ci-templates/.build-gmxapi-template.yml'
-  - local: '/admin/ci-templates/.regressiontest-template.yml'
   # Build and test in a variety of environments and configurations.
   # To do: expand matrix here to improve transparency and reduce file sizes.
   # E.g. '/admin/gitlab-ci/matrix/clang-8.gitlab-ci.yml

diff --git a/admin/ci-templates/.regressiontest-template.yml b/admin/ci-templates/.regressiontest-template.yml
deleted file mode 100644 (file)
index a2efff7..0000000
--- a/admin/ci-templates/.regressiontest-template.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Set up to only fetch the files and prepare everything for merge requests
-.regressiontests-template:
-  image: biophysics/gcc-gromacs
-  stage: configure-build
-
-  variables:
-    KUBERNETES_CPU_LIMIT: 1
-    KUBERNETES_CPU_REQUEST: 1
-    KUBERNETES_MEMORY_LIMIT: 2Gi
-  only:
-    refs:
-      - merge_requests
-      - schedules
-      - web
-  except:
-    variables:
-      - $GROMACS_RELEASE
-# Always clone the default version for this branch, master in this case
-  script:
-    - export REGTESTBRANCH=master
-    - if [ ! -z $CI_MERGE_REQUEST_TARGET_BRANCH_NAME ] ; then
-        if [[ ! -d regressiontests ]] ; then
-          mkdir regressiontests ;
-          cd regressiontests ;
-          git init ;
-          cd .. ;
-        fi ;
-        cd regressiontests ;
-        git fetch https://gitlab.com/gromacs/gromacs-regressiontests.git $REGTESTBRANCH ;
-        git checkout -qf FETCH_HEAD ;
-        git clean -ffdxq ;
-        git gc ;
-        git archive -o gmx-regressiontests.tar.gz --prefix regressiontests/ -9 HEAD;
-        echo "Build regressiontests for branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME";
-        cd ..;
-      else
-        touch regressiontests;
-        tar czf gmx-regressiontests.tar.gz regressiontests ;
-      fi;
-  artifacts:
-    paths:
-      - gmx-regressiontests.tar.gz
-
-.regressiontests-release-template:
-  # Docker image uploaded to dockerhub by user eriklindahl
-  # TODO: Get DockerFile for admin/dockerfiles
-  image: biophysics/gcc-gromacs
-  stage: release-package
-
-  variables:
-    KUBERNETES_CPU_LIMIT: 1
-    KUBERNETES_CPU_REQUEST: 1
-    KUBERNETES_MEMORY_LIMIT: 2Gi
-  only:
-    refs:
-      - schedules
-      - web
-      - triggers
-    variables:
-      - $GROMACS_RELEASE
-  script:
-    - VERSION=`cat version.json |
-        python3 -c "import json,sys; print(json.load(sys.stdin)['version'])"`
-    - REGTESTNAME="regressiontests-"$VERSION
-    - if [[ $GROMACS_RELEASE != "true" ]] ; then
-          REGTESTNAME=$REGTESTNAME-dev ;
-      fi
-    - export REGTESTBRANCH=master
-    - if [[ $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "release-20"[1-2][0-9] ]] ; then
-         export REGTESTBRANCH=$CI_COMMIT_REF_NAME ;
-      fi
-    - if [[ ! -d regressiontests ]] ; then
-        mkdir regressiontests ;
-        cd regressiontests ;
-        git init ;
-        cd .. ;
-      fi
-    - cd regressiontests
-    - git fetch https://gitlab.com/gromacs/gromacs-regressiontests.git $REGTESTBRANCH
-    - git checkout -qf FETCH_HEAD
-    - git clean -ffdxq
-    - git gc
-    - git archive -o $REGTESTNAME.tar.gz --prefix $REGTESTNAME/ -9 HEAD
-    - mv $REGTESTNAME.tar.gz ..
-    - echo "Build regressiontests for branch  $REGTESTBRANCH"
-    - cd ..
-  artifacts:
-    paths:
-      - regressiontests-*.tar.gz

diff --git a/admin/gitlab-ci/archive.gitlab-ci.yml b/admin/gitlab-ci/archive.gitlab-ci.yml
index e3d6a27a7f4ddcc05772c33ee9179ad22285704d..28a10814b459b0b32491d10953615042ecdf9ae7 100644 (file)
--- a/admin/gitlab-ci/archive.gitlab-ci.yml
+++ b/admin/gitlab-ci/archive.gitlab-ci.yml
@@ -32,6 +32,95 @@ prepare-release-version:
 
 # 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:
+  image: biophysics/gcc-gromacs
+  stage: configure-build
+
+  variables:
+    KUBERNETES_CPU_LIMIT: 1
+    KUBERNETES_CPU_REQUEST: 1
+    KUBERNETES_MEMORY_LIMIT: 2Gi
+  only:
+    refs:
+      - merge_requests
+      - schedules
+      - web
+  except:
+    variables:
+      - $GROMACS_RELEASE
+  # Always clone the default version for this branch, master in this case
+  script:
+    - export REGTESTBRANCH=master
+    - if [ ! -z $CI_MERGE_REQUEST_TARGET_BRANCH_NAME ] ; then
+      if [[ ! -d regressiontests ]] ; then
+      mkdir regressiontests ;
+      cd regressiontests ;
+      git init ;
+      cd .. ;
+      fi ;
+      cd regressiontests ;
+      git fetch https://gitlab.com/gromacs/gromacs-regressiontests.git $REGTESTBRANCH ;
+      git checkout -qf FETCH_HEAD ;
+      git clean -ffdxq ;
+      git gc ;
+      git archive -o gmx-regressiontests.tar.gz --prefix regressiontests/ -9 HEAD;
+      echo "Build regressiontests for branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME";
+      cd ..;
+      else
+      touch regressiontests;
+      tar czf gmx-regressiontests.tar.gz regressiontests ;
+      fi;
+  artifacts:
+    paths:
+      - gmx-regressiontests.tar.gz
+
+.regressiontests-release-template:
+  # Docker image uploaded to dockerhub by user eriklindahl
+  # TODO: Get DockerFile for admin/dockerfiles
+  image: biophysics/gcc-gromacs
+  stage: release-package
+
+  variables:
+    KUBERNETES_CPU_LIMIT: 1
+    KUBERNETES_CPU_REQUEST: 1
+    KUBERNETES_MEMORY_LIMIT: 2Gi
+  only:
+    refs:
+      - schedules
+      - web
+      - triggers
+    variables:
+      - $GROMACS_RELEASE
+  script:
+    - VERSION=`cat version.json |
+      python3 -c "import json,sys; print(json.load(sys.stdin)['version'])"`
+    - REGTESTNAME="regressiontests-"$VERSION
+    - if [[ $GROMACS_RELEASE != "true" ]] ; then
+      REGTESTNAME=$REGTESTNAME-dev ;
+      fi
+    - export REGTESTBRANCH=master
+    - if [[ $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "release-20"[1-2][0-9] ]] ; then
+      export REGTESTBRANCH=$CI_COMMIT_REF_NAME ;
+      fi
+    - if [[ ! -d regressiontests ]] ; then
+      mkdir regressiontests ;
+      cd regressiontests ;
+      git init ;
+      cd .. ;
+      fi
+    - cd regressiontests
+    - git fetch https://gitlab.com/gromacs/gromacs-regressiontests.git $REGTESTBRANCH
+    - git checkout -qf FETCH_HEAD
+    - git clean -ffdxq
+    - git gc
+    - git archive -o $REGTESTNAME.tar.gz --prefix $REGTESTNAME/ -9 HEAD
+    - mv $REGTESTNAME.tar.gz ..
+    - echo "Build regressiontests for branch  $REGTESTBRANCH"
+    - cd ..
+  artifacts:
+    paths:
+      - regressiontests-*.tar.gz
 
 .regressiontests-extends-template:
   extends:
@@ -43,6 +132,21 @@ prepare-regressiontests:
     - .regressiontests-extends-template
     - .regressiontests-template
 
+package-regressiontests-release:
+  extends:
+    - .regressiontests-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:
@@ -103,21 +207,6 @@ build-archive-nightly:
   variables:
     BUILD_DIR: build-package
 
-package-regressiontests-release:
-  extends:
-    - .regressiontests-extends-template
-    - .regressiontests-release-template
-  needs:
-    - job: prepare-release-version
-      artifacts: true
-  only:
-    refs:
-      - triggers
-      - web
-      - schedules
-    variables:
-      - $GROMACS_RELEASE
-
 package-archive-release:
   extends:
     - .build-archive