From 47934785411bd1bdce361367223fabd6cf61b321 Mon Sep 17 00:00:00 2001
From: Gregory Ashton <gregory.ashton@ligo.org>
Date: Fri, 20 Nov 2020 08:06:48 -0600
Subject: [PATCH] Revert "Reduce to one test"
This reverts commit d03e7b73cdc591584ff736b0d3c1fba57ce15391.
---
.gitlab-ci.yml | 22 ++++++++++----------
containers/dockerfile-template | 2 +-
containers/v2-dockerfile-test-suite-python35 | 2 +-
containers/v2-dockerfile-test-suite-python36 | 2 +-
containers/v2-dockerfile-test-suite-python37 | 2 +-
containers/v2-dockerfile-test-suite-python38 | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c6d0878..a063d51d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ basic-3.7:
# test example on python 3.7
python-3.7:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
script:
- python -m pip install .
@@ -69,7 +69,7 @@ python-3.7:
# test example on python 3.8
python-3.8:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python38
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python38-frozen
script:
- python -m pip install .
@@ -78,7 +78,7 @@ python-3.8:
# test example on python 3.6
python-3.6:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python36
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python36-frozen
script:
- python -m pip install .
@@ -87,7 +87,7 @@ python-3.6:
# test samplers on python 3.7
python-3.7-samplers:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
script:
- python -m pip install .
@@ -97,7 +97,7 @@ python-3.7-samplers:
# test samplers on python 3.6
python-3.6-samplers:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python36
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python36-frozen
script:
- python -m pip install .
@@ -106,7 +106,7 @@ python-3.6-samplers:
# Test containers are up to date
containers:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
script:
- cd containers
- python write_dockerfiles.py
@@ -117,7 +117,7 @@ containers:
# Tests run at a fixed schedule rather than on push
scheduled-python-3.7:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
only:
- schedules
script:
@@ -129,7 +129,7 @@ scheduled-python-3.7:
plotting:
stage: test
- image: bilbydev/bilby-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
only:
- schedules
script:
@@ -140,7 +140,7 @@ plotting:
authors:
stage: test
- image: bilbydev/bilby-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
script:
- python test/check_author_list.py
@@ -162,7 +162,7 @@ pages:
deploy_release:
stage: deploy
- image: bilbydev/v2-dockerfile-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
variables:
TWINE_USERNAME: $PYPI_USERNAME
TWINE_PASSWORD: $PYPI_PASSWORD
@@ -177,7 +177,7 @@ deploy_release:
precommits-py3.7:
stage: test
- image: bilbydev/v2-dockerfile-test-suite-python37
+ image: quay.io/gregory_ashton/bilby_v2-dockerfile-test-suite-python37-frozen
script:
- source activate python37
- mkdir -p .pip37
diff --git a/containers/dockerfile-template b/containers/dockerfile-template
index 46d4f547..eb2fa024 100644
--- a/containers/dockerfile-template
+++ b/containers/dockerfile-template
@@ -1,4 +1,4 @@
-FROM continuumio/miniconda3
+FROM containers.ligo.org/docker/base:conda
LABEL name="bilby Base miniconda3" \
maintainer="Gregory Ashton <gregory.ashton@ligo.org>"
diff --git a/containers/v2-dockerfile-test-suite-python35 b/containers/v2-dockerfile-test-suite-python35
index 38d4c8b2..544b562f 100644
--- a/containers/v2-dockerfile-test-suite-python35
+++ b/containers/v2-dockerfile-test-suite-python35
@@ -1,6 +1,6 @@
# This dockerfile is written automatically and should not be modified by hand.
-FROM continuumio/miniconda3
+FROM containers.ligo.org/docker/base:conda
LABEL name="bilby Base miniconda3" \
maintainer="Gregory Ashton <gregory.ashton@ligo.org>"
diff --git a/containers/v2-dockerfile-test-suite-python36 b/containers/v2-dockerfile-test-suite-python36
index ae75fff0..d9a2782c 100644
--- a/containers/v2-dockerfile-test-suite-python36
+++ b/containers/v2-dockerfile-test-suite-python36
@@ -1,6 +1,6 @@
# This dockerfile is written automatically and should not be modified by hand.
-FROM continuumio/miniconda3
+FROM containers.ligo.org/docker/base:conda
LABEL name="bilby Base miniconda3" \
maintainer="Gregory Ashton <gregory.ashton@ligo.org>"
diff --git a/containers/v2-dockerfile-test-suite-python37 b/containers/v2-dockerfile-test-suite-python37
index 9e27fcab..b77f4892 100644
--- a/containers/v2-dockerfile-test-suite-python37
+++ b/containers/v2-dockerfile-test-suite-python37
@@ -1,6 +1,6 @@
# This dockerfile is written automatically and should not be modified by hand.
-FROM continuumio/miniconda3
+FROM containers.ligo.org/docker/base:conda
LABEL name="bilby Base miniconda3" \
maintainer="Gregory Ashton <gregory.ashton@ligo.org>"
diff --git a/containers/v2-dockerfile-test-suite-python38 b/containers/v2-dockerfile-test-suite-python38
index 69005549..71cf85d0 100644
--- a/containers/v2-dockerfile-test-suite-python38
+++ b/containers/v2-dockerfile-test-suite-python38
@@ -1,6 +1,6 @@
# This dockerfile is written automatically and should not be modified by hand.
-FROM continuumio/miniconda3
+FROM containers.ligo.org/docker/base:conda
LABEL name="bilby Base miniconda3" \
maintainer="Gregory Ashton <gregory.ashton@ligo.org>"
--
GitLab