From e29ed5107e9d1198c4b4010ff45c185ee3fda8d9 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 30 Sep 2021 10:32:20 +0200
Subject: [PATCH] Use conda-forge centos 7 docker images
---
.gitlab-ci.yml | 2 +-
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 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1180b03..979cf1de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ stages:
BUILD_EGG: "true"
tags:
- docker
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
before_script:
- rm -f /root/.condarc
- rm -rf /root/.conda
diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index 5da2248c..7bd73a27 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:
before_script:
- rm -f /root/.condarc
- rm -rf /root/.conda
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ 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 299ee797..dc5643ff 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: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
before_script:
- rm -f /root/.condarc
- rm -rf /root/.conda
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 0939e810..c6a88d22 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: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
build_linux_37:
extends: .build_linux_template
@@ -87,7 +87,7 @@ build_macos_intel_38:
stage: cleanup
tags:
- docker
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ 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 a6ea13d3..f1c3dcd5 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -54,7 +54,7 @@ build_linux:
extends: .build_template
tags:
- docker
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
variables:
PYTHON_VERSION: "3.8"
BUILD_EGG: "true"
@@ -99,7 +99,7 @@ build_macos_intel:
extends: .test_template
tags:
- docker
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ 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 5dc3d0a3..a43a7c28 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -54,7 +54,7 @@ stages:
extends: .build_template
tags:
- docker
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -129,7 +129,7 @@ build_linux_38:
extends: .test_template
tags:
- docker
- image: docker.idiap.ch/bob/docker-images/c3i-linux-64
+ image: quay.io/condaforge/linux-anvil-cos7-x86_64
.test_macos_intel_template:
--
GitLab