From 721a42ccf89930b858955d6ae83eca0a2ef09444 Mon Sep 17 00:00:00 2001
From: Eric Gallimore <egallimore@whoi.edu>
Date: Wed, 8 May 2024 09:18:43 -0400
Subject: [PATCH] Tag test images with the pipeline ID to avoid issues when
running jobs in parallel.
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff45a6dc..0df57d2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ build_test_image:
services:
- name: docker:dind
script:
- - docker build --rm -t ros_acomms-tests:latest -f ros_acomms_tests/tests.Dockerfile .
+ - docker build --rm -t ros_acomms-tests:pipeline_$CI_PIPELINE_ID -f ros_acomms_tests/tests.Dockerfile .
except:
- dev/autodocs
@@ -18,7 +18,7 @@ build_auto-doc_image:
services:
- name: docker:dind
script:
- - docker build --rm -t ros_acomms-docs:latest -f docs/auto-docs.Dockerfile .
+ - docker build --rm -t ros_acomms-docs:pipeline_$CI_PIPELINE_ID -f docs/auto-docs.Dockerfile .
only:
- master
- tags
@@ -42,7 +42,7 @@ trigger-ros_acomms_net_tools-pipeline:
.run_tests_base: &run_tests_base
stage: test
- image: ros_acomms-tests:latest
+ image: ros_acomms-tests:pipeline_$CI_PIPELINE_ID
script:
- source /ros_entrypoint.sh
- mkdir -p ~/catkin_ws/src
@@ -113,7 +113,7 @@ test-with-hardware:
stage: test
tags:
- modembox
- image: ros_acomms-tests:latest
+ image: ros_acomms-tests:pipeline_$CI_PIPELINE_ID
script:
- source /ros_entrypoint.sh
- mkdir -p ~/catkin_ws/src
@@ -142,7 +142,7 @@ test-with-hardware:
junit: '*.results.xml'
test-coverage:
- image: ros_acomms-tests:latest
+ image: ros_acomms-tests:pipeline_$CI_PIPELINE_ID
except:
- dev/autodocs
needs:
@@ -171,7 +171,7 @@ test-coverage:
path: coverage.xml
auto-docs-pdf:
- image: ros_acomms-docs:latest
+ image: ros_acomms-docs:pipeline_$CI_PIPELINE_ID
stage: deploy
script:
- pip install -r requirements.txt
@@ -188,7 +188,7 @@ auto-docs-pdf:
- dev/autodocs
pages:
- image: ros_acomms-docs:latest
+ image: ros_acomms-docs:pipeline_$CI_PIPELINE_ID
stage: deploy
script:
- source /ros_entrypoint.sh
--
GitLab