From d345692cc4a346d8d6122d884ea38e48798677c8 Mon Sep 17 00:00:00 2001 From: Andre Anjos <andre.dos.anjos@gmail.com> Date: Mon, 25 Oct 2021 17:10:56 +0200 Subject: [PATCH] [ci] Run on machines with the "bob" tag, closes #88 --- .gitlab-ci.yml | 4 ++++ bob/devtools/data/gitlab-ci/base-build.yaml | 2 ++ bob/devtools/data/gitlab-ci/beat-docker-package.yaml | 1 + bob/devtools/data/gitlab-ci/docs.yaml | 1 + bob/devtools/data/gitlab-ci/nightlies.yaml | 3 +++ bob/devtools/data/gitlab-ci/noarch.yaml | 6 ++++++ bob/devtools/data/gitlab-ci/python-package.yaml | 4 ++++ bob/devtools/data/gitlab-ci/single-package.yaml | 6 ++++++ 8 files changed, 27 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fee05b79..d1b6f916 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,7 @@ stages: variables: BUILD_EGG: "true" tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 before_script: @@ -49,6 +50,7 @@ stages: .build_macos_intel_template: extends: .build_template tags: + - bob - macos - intel before_script: @@ -134,6 +136,7 @@ build_macos_intel_bob_devtools: - build_macos_intel_bob_devtools tags: - docker + - bob cache: paths: - miniconda.sh @@ -176,6 +179,7 @@ pypi: - build_macos_intel_deps - build_macos_intel_bob_devtools tags: + - bob - docker cache: paths: diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml index 3a83e245..a3701b75 100644 --- a/bob/devtools/data/gitlab-ci/base-build.yaml +++ b/bob/devtools/data/gitlab-ci/base-build.yaml @@ -32,6 +32,7 @@ stages: build_linux: extends: .build_template tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 cache: @@ -41,6 +42,7 @@ build_linux: build_macos_intel: extends: .build_template tags: + - bob - macos - intel cache: diff --git a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml index 74491a1e..f25e1315 100644 --- a/bob/devtools/data/gitlab-ci/beat-docker-package.yaml +++ b/bob/devtools/data/gitlab-ci/beat-docker-package.yaml @@ -1,3 +1,4 @@ build_linux_38: tags: + - bob - docker-build diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml index a35cf02d..193780cf 100644 --- a/bob/devtools/data/gitlab-ci/docs.yaml +++ b/bob/devtools/data/gitlab-ci/docs.yaml @@ -19,6 +19,7 @@ stages: # All stages are prepared the same, with a base set of commands .bootstrap: tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 before_script: diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml index c477d693..f9a072a8 100644 --- a/bob/devtools/data/gitlab-ci/nightlies.yaml +++ b/bob/devtools/data/gitlab-ci/nightlies.yaml @@ -42,6 +42,7 @@ stages: .build_linux_template: extends: .build_template tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 @@ -57,6 +58,7 @@ build_macos_intel_38: variables: PYTHON_VERSION: "3.8" tags: + - bob - macos - intel cache: @@ -68,6 +70,7 @@ build_macos_intel_38: extends: .bootstrap stage: cleanup tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 script: diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml index 6a128268..1b45959e 100644 --- a/bob/devtools/data/gitlab-ci/noarch.yaml +++ b/bob/devtools/data/gitlab-ci/noarch.yaml @@ -51,6 +51,7 @@ stages: build_linux: extends: .build_template tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 variables: @@ -77,6 +78,7 @@ build_macos_intel: key: "build" extends: .build_template tags: + - bob - macos - intel @@ -96,6 +98,7 @@ build_macos_intel: .test_linux_template: extends: .test_template tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 @@ -103,6 +106,7 @@ build_macos_intel: .test_macos_intel_template: extends: .test_template tags: + - bob - macos - intel @@ -118,6 +122,7 @@ build_macos_intel: - build_linux - build_macos_intel tags: + - bob - docker cache: key: "deploy" @@ -157,6 +162,7 @@ pypi: - build_linux - build_macos_intel tags: + - bob - docker cache: key: "pypi" diff --git a/bob/devtools/data/gitlab-ci/python-package.yaml b/bob/devtools/data/gitlab-ci/python-package.yaml index f13e63bf..7a809176 100644 --- a/bob/devtools/data/gitlab-ci/python-package.yaml +++ b/bob/devtools/data/gitlab-ci/python-package.yaml @@ -21,6 +21,7 @@ stages: build: image: python:latest tags: + - bob - docker stage: build before_script: @@ -46,6 +47,7 @@ build: # Test targets .test_template: tags: + - bob - docker stage: test dependencies: @@ -80,6 +82,7 @@ test_py310: .deploy_template: image: python:latest tags: + - bob - docker stage: deploy dependencies: @@ -111,6 +114,7 @@ deploy_stable: pypi: image: python:latest tags: + - bob - docker stage: pypi environment: pypi diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml index 4d9599e7..8bb8bba9 100644 --- a/bob/devtools/data/gitlab-ci/single-package.yaml +++ b/bob/devtools/data/gitlab-ci/single-package.yaml @@ -51,6 +51,7 @@ stages: .build_linux_template: extends: .build_template tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 artifacts: @@ -62,6 +63,7 @@ stages: .build_macos_intel_template: extends: .build_template tags: + - bob - macos - intel artifacts: @@ -112,6 +114,7 @@ build_linux_38: .test_linux_template: extends: .test_template tags: + - bob - docker image: quay.io/condaforge/linux-anvil-cos7-x86_64 @@ -119,6 +122,7 @@ build_linux_38: .test_macos_intel_template: extends: .test_template tags: + - bob - macos - intel @@ -134,6 +138,7 @@ build_linux_38: - build_linux_38 - build_macos_intel_38 tags: + - bob - docker cache: key: "deploy" @@ -173,6 +178,7 @@ pypi: - build_linux_38 - build_macos_intel_38 tags: + - bob - docker cache: key: "pypi" -- GitLab