From c2ece5a0328ac3b97e16644b4b6ebeb8c0136299 Mon Sep 17 00:00:00 2001 From: Eric Timmons <etimmons@mit.edu> Date: Tue, 3 Nov 2020 19:51:53 -0500 Subject: [PATCH] Make pushing more robust to a build step from another pipeline wedging itself in there --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90969b3..cb02b47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ Fixup manifest: done - retry -t 3 -d 60 -- bashbrew build $CI_PROJECT_NAME - docker images - - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH $CI_PROJECT_NAME + - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH$CI_PIPELINE_IID $CI_PROJECT_NAME cache: paths: - cache @@ -88,7 +88,7 @@ Fixup manifest: - foreach ($parent in $parentArray){ docker pull $parent } - bashbrew build $CI_PROJECT_NAME - docker images - - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH $CI_PROJECT_NAME + - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH$CI_PIPELINE_IID $CI_PROJECT_NAME cache: paths: - cache @@ -149,6 +149,7 @@ Bashbrew build - winamd64: - docker info - mkdir -p cache - cp "build/$CI_PROJECT_NAME" "$CI_PROJECT_NAME" + - bashbrew tag --namespace=$CANONICAL_NAMESPACE$ARCH$CI_PIPELINE_IID --target-namespace=$CANONICAL_NAMESPACE$ARCH $CI_PROJECT_NAME - retry -t 3 -d 60 -- bashbrew --namespace=$CANONICAL_NAMESPACE$ARCH push $CI_PROJECT_NAME cache: paths: @@ -167,6 +168,7 @@ Bashbrew build - winamd64: script: - docker info - cp "build/$CI_PROJECT_NAME" "$CI_PROJECT_NAME" + - bashbrew tag --namespace=$CANONICAL_NAMESPACE$ARCH$CI_PIPELINE_IID --target-namespace=$CANONICAL_NAMESPACE$ARCH $CI_PROJECT_NAME - bashbrew --namespace=$CANONICAL_NAMESPACE$ARCH push $CI_PROJECT_NAME cache: paths: -- GitLab