From 112ad8165486cc224df371d104550b5efb2f8f63 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 2 Nov 2020 13:51:06 +0100
Subject: [PATCH] Use our custom centos 7 image
---
.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 | 2 +-
bob/devtools/data/gitlab-ci/noarch.yaml | 4 ++--
bob/devtools/data/gitlab-ci/single-package.yaml | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9c11cea..61c7daf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ build_linux:
BUILD_EGG: "true"
tags:
- docker
- image: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-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 fd760e8e..629f7e3b 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: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-64
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index b188a857..a24fa2ca 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: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-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 fc95b6f5..2f45e255 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: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-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 d6214196..2adf7fd2 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: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-64
variables:
PYTHON_VERSION: "3.7"
BUILD_EGG: "true"
@@ -92,7 +92,7 @@ build_macosx:
extends: .test_template
tags:
- docker
- image: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-64
.test_macosx_template:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index b3c6c686..d469c32f 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: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-64
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -123,7 +123,7 @@ build_linux_37:
extends: .test_template
tags:
- docker
- image: centos:7
+ image: docker.idiap.ch/bob/docker-images/c3i-linux-64
.test_macosx_template:
--
GitLab