Revert "Make everything run on Gitlab infrastructure."

This reverts commit af3b278.
meldaw84 · Jul 1, 2020 · 80b4531 · 80b4531
1 parent 37d1c3d
commit 80b4531
Show file tree

Hide file tree

Showing 6 changed files with 188 additions and 164 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -42,11 +42,11 @@ include:
   - local: '/admin/gitlab-ci/global.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/rules.gitlab-ci.yml'
   # gmxapi Python package.
-  # - local: '/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml'
   # Further API validation and usability of sample gmxapi extension package.
-  # - local: '/admin/gitlab-ci/sample_restraint.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/sample_restraint.gitlab-ci.yml'
   # API regression testing using sample gmxapi extension package.
-  # - local: '/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml'
   # Build and test GROMACS in a variety of environments and configurations.
   # To do: Consider expanding matrix here to improve transparency and reduce file sizes.
   # E.g. '/admin/gitlab-ci/matrix/clang-8.gitlab-ci.yml

diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml
@@ -274,6 +274,7 @@ webpage:configure:
     - .rules:nightly-only-for-release
   cache: {}
   tags:
+    - k8s-scilifelab
   dependencies:
     - archive:package
     - regressiontests:package
@@ -292,6 +293,7 @@ webpage:dependencies:
     - .rules:nightly-only-for-release
   stage: release-build
   tags:
+    - k8s-scilifelab
   needs:
     - job: webpage:configure
   variables:
@@ -303,6 +305,7 @@ webpage:build:release:
     - .rules:nightly-only-for-release
   stage: release-prepare-deploy
   tags:
+    - k8s-scilifelab
   dependencies:
     - webpage:dependencies
     - webpage:configure