From: Petr Štetiar <ynezz@true.cz>
Date: Sat, 6 Mar 2021 10:35:18 +0000 (+0100)
Subject: ci: buildslave: fix Docker image tests
X-Git-Tag: v1~37
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=115c431809a0b7560fb8b122d49a7b7036736d8a;p=buildbot.git

ci: buildslave: fix Docker image tests

Refactoring leftover.

Fixes: 70883902ecf1 ("GitLab CI integration")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/.gitlab/docker/buildslave/gitlab.yml b/.gitlab/docker/buildslave/gitlab.yml
index 960ee25..2469795 100644
--- a/.gitlab/docker/buildslave/gitlab.yml
+++ b/.gitlab/docker/buildslave/gitlab.yml
@@ -9,10 +9,11 @@ test Docker image buildslave:
   script:
     - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/test Docker image \(.*\)/\1/')"
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_REF_SLUG"
+    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
     - >
       docker run --rm --env BUILDSLAVE_NAME=foo --env BUILDSLAVE_PASSWORD=XXX
-      "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_REF_SLUG" | grep "worker configured in /builder"
+      "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG" |
+      grep "worker configured in /builder"
 
 deploy Docker image buildslave:
   stage: docker deploy