From ec9f364458fa0ae480cf8ce42374667106fb1fb5 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 24 Nov 2021 11:16:29 +0000
Subject: [PATCH] L2SS-205: Build device images once
---
.gitlab-ci.yml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73f9b0f12..9166b6a98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,20 @@ docker_store_images_changes:
refs:
- tags
- master
+# TODO(Corne): Remove this after first run
+docker_build_image_devices:
+ extends: .base_docker_images
+ script:
+ - 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
docker_build_image_all:
extends: .base_docker_images
only:
@@ -86,6 +100,16 @@ docker_build_image_all:
- 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
docker_build_image_elk:
extends: .base_docker_images_except
only:
@@ -247,6 +271,7 @@ integration_test_docker:
tag="$CI_COMMIT_REF_SLUG"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi
+ - echo $tag
- apk add --update make bash docker-compose
- apk add --update bind-tools
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -265,6 +290,7 @@ 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
# Allow integration test to execute
- chmod u+x $CI_PROJECT_DIR/sbin/run_integration_test.sh
--
GitLab