From e071d44ca9118cc79be2f69f6e051604121d221e Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 29 Oct 2020 16:21:53 +0100
Subject: [PATCH] Use centos:7 to build Bob
---
.gitlab-ci.yml | 2 +-
bob/devtools/data/gitlab-ci/base-build.yaml | 2 +-
bob/devtools/data/gitlab-ci/docs.yaml | 3 +--
bob/devtools/data/gitlab-ci/nightlies.yaml | 2 +-
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
bob/devtools/data/gitlab-ci/single-package.yaml | 4 ++--
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 154ae94a..e9c11cea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ build_linux:
BUILD_EGG: "true"
tags:
- docker
- image: continuumio/conda-concourse-ci
+ image: centos:7
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 c8cdd734..fd760e8e 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: continuumio/conda-concourse-ci
+ image: centos:7
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 3a1111cc..b188a857 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: continuumio/conda-concourse-ci
+ image: centos:7
before_script:
- rm -f /root/.condarc
- rm -rf /root/.conda
@@ -30,7 +30,6 @@ stages:
- conda activate base
cache:
paths:
- - miniconda.sh
- torch
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index b55694d4..fc95b6f5 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -84,7 +84,7 @@ build_macosx_37:
stage: cleanup
tags:
- docker
- image: continuumio/conda-concourse-ci
+ image: centos:7
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 1f5de100..d6214196 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -48,7 +48,7 @@ build_linux:
extends: .build_template
tags:
- docker
- image: continuumio/conda-concourse-ci
+ image: centos:7
variables:
PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
@@ -92,7 +92,7 @@ build_macosx:
extends: .test_template
tags:
- docker
- image: continuumio/conda-concourse-ci
+ image: centos:7
.test_macosx_template:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 27556dc1..b3c6c686 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -49,7 +49,7 @@ stages:
extends: .build_template
tags:
- docker
- image: continuumio/conda-concourse-ci
+ image: centos:7
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -123,7 +123,7 @@ build_linux_37:
extends: .test_template
tags:
- docker
- image: continuumio/conda-concourse-ci
+ image: centos:7
.test_macosx_template:
--
GitLab