From a6a754e00ef2060d3814115259d7f81ed098c800 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 6 Oct 2021 11:53:31 +0200
Subject: [PATCH] [data] Use centos7 images for the build, to allow pytorch to
be used on the CI stack
---
bob/devtools/data/gitlab-ci/base-build.yaml | 2 +-
bob/devtools/data/gitlab-ci/docs.yaml | 2 +-
bob/devtools/data/gitlab-ci/nightlies.yaml | 4 ++--
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
bob/devtools/data/gitlab-ci/single-package.yaml | 4 ++--
bob/devtools/data/recipe_append.yaml | 4 ++++
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index f77159e1..c9e745c9 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -35,7 +35,7 @@ build_linux:
- docker
before_script:
- rm -fv ~/.condarc
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 6983cedc..916bb97d 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -20,7 +20,7 @@ stages:
.bootstrap:
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
before_script:
- rm -fv ~/.condarc
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 5a249e12..ee752ebd 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -44,7 +44,7 @@ stages:
extends: .build_template
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
build_linux_38:
extends: .build_linux_template
@@ -70,7 +70,7 @@ build_macos_intel_38:
stage: cleanup
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
script:
- bdt ci clean-betas -vv
cache:
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index 73a075c5..0f7ad821 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -53,7 +53,7 @@ build_linux:
extends: .build_template
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
variables:
PYTHON_VERSION: "3.8"
BUILD_EGG: "true"
@@ -98,7 +98,7 @@ build_macos_intel:
extends: .test_template
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
.test_macos_intel_template:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 5759d986..dc324c58 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -53,7 +53,7 @@ stages:
extends: .build_template
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -114,7 +114,7 @@ build_linux_38:
extends: .test_template
tags:
- docker
- image: quay.io/condaforge/linux-anvil-comp7
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
.test_macos_intel_template:
diff --git a/bob/devtools/data/recipe_append.yaml b/bob/devtools/data/recipe_append.yaml
index f02e4e0b..b8943cd0 100644
--- a/bob/devtools/data/recipe_append.yaml
+++ b/bob/devtools/data/recipe_append.yaml
@@ -3,3 +3,7 @@ build:
- DOCSERVER
- NOSE_EVAL_ATTR
- PYTEST_ADDOPTS
+
+requirements:
+ build:
+ - sysroot_linux-64 2.17 # [linux64]
--
GitLab