From 8c7079c211410974667504248731acca29887eb8 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 10 Jan 2020 15:05:43 +0100
Subject: [PATCH] [gitlab] Remove /root/.condarc in docker images from
continuum
---
.gitlab-ci.yml | 6 ++++++
bob/devtools/data/gitlab-ci/base-build.yaml | 2 ++
bob/devtools/data/gitlab-ci/docs.yaml | 10 ++++------
bob/devtools/data/gitlab-ci/nightlies.yaml | 1 +
bob/devtools/data/gitlab-ci/single-package.yaml | 1 +
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86a13eb5..0552d71b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,8 @@ stages:
tags:
- docker
image: continuumio/conda-concourse-ci
+ before_build:
+ - rm -f /root/.condarc
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
@@ -94,6 +96,8 @@ build_macosx_37:
# Deploy targets
.deploy_template:
stage: deploy
+ before_build:
+ - rm -f /root/.condarc
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
@@ -136,6 +140,8 @@ pypi:
- /^v\d+\.\d+\.\d+([abc]\d*)?$/ # PEP-440 compliant version (tags)
except:
- branches
+ before_build:
+ - rm -f /root/.condarc
script:
- python3 ./bob/devtools/bootstrap.py -vv local base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index 3007c5e3..fdd44084 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -36,6 +36,8 @@ build_linux:
extends: .build_template
tags:
- docker
+ before_script:
+ - rm -f /root/.condarc
image: continuumio/conda-concourse-ci
cache:
key: "linux-cache"
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 0406d6de..7ef9ff72 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -17,7 +17,11 @@ stages:
# All stages are prepared the same, with a base set of commands
.bootstrap:
+ tags:
+ - docker
+ image: continuumio/conda-concourse-ci
before_script:
+ - rm -f /root/.condarc
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
@@ -45,9 +49,6 @@ build:
- sphinx
- ${CONDA_ROOT}/conda-bld/linux-64/*.conda
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
- tags:
- - docker
- image: continuumio/conda-concourse-ci
cache:
key: "build"
@@ -61,9 +62,6 @@ build:
- bdt ci clean -vv
dependencies:
- build
- tags:
- - docker
- image: continuumio/conda-concourse-ci
cache:
key: "deploy"
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index ed9ba7ed..420772ac 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -17,6 +17,7 @@ stages:
# All stages are prepared the same, with a base set of commands
.bootstrap:
before_script:
+ - "[ -r /root/.condarc ] && rm -f /root/.condarc"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 1af05699..27aae271 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -19,6 +19,7 @@ stages:
# All stages are prepared the same, with a base set of commands
.bootstrap:
before_script:
+ - "[ -r /root/.condarc ] && rm -f /root/.condarc"
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
--
GitLab