From 9ef69cb9197067b9c8a92032b95690c26774568b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 12:18:51 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 4 ++--
.docker/tester.yml | 2 +-
.gitlab-ci.yml | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 3230ad0..4ac1cc7 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,5 +1,5 @@
-ARG CI_REGISTRY_IMAGE
-FROM $CI_REGISTRY_IMAGE
+ARG CPPLIB_REGISTRY_IMAGE
+FROM $CPPLIB_REGISTRY_IMAGE
COPY .docker/wait-for-it.sh /wait-for-it.sh
diff --git a/.docker/tester.yml b/.docker/tester.yml
index 83db879..1673eed 100644
--- a/.docker/tester.yml
+++ b/.docker/tester.yml
@@ -1,7 +1,7 @@
version: '3.7'
services:
tester:
- image: "$CI_REGISTRY_IMAGE"
+ image: "$CPPINTTEST_REGISTRY_IMAGE"
networks:
- docker_caosnet
volumes:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b824066..f5e147a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@
variables:
# this is the image where cpplib repo is present (artifact from pipeline in
# caosdb-cpplib)
- CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
+ CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CI_COMMIT_REF_NAME
# this is the image where all the docker containers (server, mysql and test
# suite) are started
CI_REGISTRY_IMAGE_BASE: $CI_REGISTRY/caosdb/src/caosdb-pyinttest/base:latest
@@ -61,7 +61,7 @@ info:
needs: []
script:
- echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)"
- - echo "$CI_REGISTRY_IMAGE"
+ - echo "$CPPLIB_REGISTRY_IMAGE"
- echo "$CI_REGISTRY_IMAGE_BASE"
- echo "$CPPINTTEST_REGISTRY_IMAGE"
- echo "$CPPINTTEST_IMAGE_CACHE"
@@ -92,9 +92,9 @@ build-testenv:
- CPPINT_REF=${CPPINT_REF:-dev}
#build testenv image
- - docker pull $CI_REGISTRY_IMAGE || true # remove??? docker build --pull???
+ - docker pull $CPPLIB_REGISTRY_IMAGE || true # remove??? docker build --pull???
- docker build
- --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE
+ --build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
--file .docker/Dockerfile
--pull
--cache-from $CPPINTTEST_REGISTRY_IMAGE
--
GitLab