From 233e951a0c9671e84ff7acc3c43bc3d8a454edc4 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 24 Nov 2021 16:52:47 +0000
Subject: [PATCH] L2SS-205: Try trigger cache
---
.gitlab-ci.yml | 35 +++++++++++++++++--------------
docker-compose/Makefile | 3 ++-
sbin/tag_and_push_docker_image.sh | 1 +
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0fe1155e..b172c7413 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,21 +70,21 @@ docker_store_images_changes:
docker_build_image_devices:
extends: .base_docker_images
script:
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apspu-sim $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh recv-sim $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh sdptr-sim $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh unb2-sim $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apsct $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-boot $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation_control $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-recv $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sdp $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sst $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-unb2 $tag
- - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-xst $tag
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apsct-sim latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh apspu-sim latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh recv-sim latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh sdptr-sim latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh unb2-sim latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apsct latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-boot latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation_control latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-recv latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sdp latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-sst latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-unb2 latest
+ - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-xst latest
docker_build_image_all:
extends: .base_docker_images
only:
@@ -295,8 +295,11 @@ integration_test_docker:
# Allow docker image script to execute
- chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh
# Do not remove 'bash' or statement will be ignored by primitive docker shell
- - echo $tag
- bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh pull $tag
+# TODO(Corne): Remove me
+ - echo $tag
+ - docker image ls
+ - docker ps
# Allow integration test to execute
- chmod u+x $CI_PROJECT_DIR/sbin/run_integration_test.sh
# Do not remove 'bash' or statement will be ignored by primitive docker shell
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index d85ff1df8..33e77b65e 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -136,7 +136,8 @@ pull: ## pull the images from the Docker hub
build: ## rebuild images
# docker-compose does not support build dependencies, so manage those here
$(DOCKER_COMPOSE_ARGS) docker-compose -f lofar-device-base.yml -f networks.yml build --progress=plain
- $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --parallel --progress=plain $(SERVICE)
+ #TODO(Corne): Add --parallel
+ $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) build --progress=plain $(SERVICE)
build-nocache: ## rebuild images from scratch
# docker-compose does not support build dependencies, so manage those here
diff --git a/sbin/tag_and_push_docker_image.sh b/sbin/tag_and_push_docker_image.sh
index 85eac18bc..f4c74d202 100755
--- a/sbin/tag_and_push_docker_image.sh
+++ b/sbin/tag_and_push_docker_image.sh
@@ -119,6 +119,7 @@ if [ ! -z "${1+x}" ] && [ "${1}" == "pull" ]; then
# Pull images, at least one of the two images must succeed
echo "docker pull ${local_url}:${tag}"
docker pull "${local_url}:${tag}" || docker pull "${local_url}:latest" || exit 1
+ docker tag "${local_url}:${tag}" "${2}" || docker tag "${local_url}:latest" "${2}" || exit 1
done
exit 0
--
GitLab