commit 4dc69aea4fa837e4820a8deebba4dba082daa27a
author Fatih Degirmenci <fdegir@gmail.com> Mon Oct 05 12:06:56 2020 +0000
committer Nordix Gerrit <gerrit@nordix.org> Mon Oct 05 12:06:56 2020 +0000
tree 776b532d16283fe98fb21a4bbe75de48d27957f3
parent 3a125d05d6c146983d175c163979e6b01bee0d14
parent 72e7188c30c39e534e2a7530b8339bcf32218dd2

Merge "eiffel: Fix image name var and set harbor credentials"

jjb/eiffel/global-eiffel-container-build.yaml

diff --git a/jjb/eiffel/global-eiffel-container-build.yaml b/jjb/eiffel/global-eiffel-container-build.yaml
index 9c01b26..cf28800 100644
--- a/jjb/eiffel/global-eiffel-container-build.yaml
+++ b/jjb/eiffel/global-eiffel-container-build.yaml
@@ -94,6 +94,7 @@
     wrappers:
       - build-timeout:
           timeout: 10
+      - nordixinfra-harbor-creds-wrapper
       - mask-passwords
       - openstack:
           single-use: True

jjb/eiffel/scripts/eiffel-container-build-tag-push.sh

diff --git a/jjb/eiffel/scripts/eiffel-container-build-tag-push.sh b/jjb/eiffel/scripts/eiffel-container-build-tag-push.sh
index b2ea4b3..26049e2 100644
--- a/jjb/eiffel/scripts/eiffel-container-build-tag-push.sh
+++ b/jjb/eiffel/scripts/eiffel-container-build-tag-push.sh
@@ -32,7 +32,7 @@
 IMAGE_NAME_TAG="$NORDIX_REGISTRY/$HARBOR_EIFFEL_PROJECT/$PROJECT:$IMAGE_TAG"
 
 # set the build command so we can log it to console
-PODMAN_BUILD_CMD="podman build --log-level $PODMAN_LOG_LEVEL --tag $IMAGE_NAME ."
+PODMAN_BUILD_CMD="podman build --log-level $PODMAN_LOG_LEVEL --tag $IMAGE_NAME_TAG ."
 
 echo "Info  : Building the container image with the command"
 echo "        $PODMAN_BUILD_CMD"