From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Tue, 11 Oct 2022 19:08:18 +0000 (+0000)
Subject: Merge "Fix: Correctly capture openstack port cli output"
X-Git-Tag: v0.82.0~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=f4060007fa2971733e76b142ad9c705e8ad20590;hp=d5d5be584244ff5db85250ec3ad7618cc91753b5;p=releng%2Fglobal-jjb.git

Merge "Fix: Correctly capture openstack port cli output"
---

diff --git a/releasenotes/notes/fix-docker-push-109df3ce32505b1c.yaml b/releasenotes/notes/fix-docker-push-109df3ce32505b1c.yaml
new file mode 100644
index 00000000..94c434fd
--- /dev/null
+++ b/releasenotes/notes/fix-docker-push-109df3ce32505b1c.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix the docker-push script which is broken due to a synxtax error causing
+    the docker_push_command variable to not be set.
diff --git a/releasenotes/notes/fix-docker-push-4113e45cde55fc56.yaml b/releasenotes/notes/fix-docker-push-4113e45cde55fc56.yaml
new file mode 100644
index 00000000..5474cfc4
--- /dev/null
+++ b/releasenotes/notes/fix-docker-push-4113e45cde55fc56.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Remove line break in the docker_push_command variable
+    causing the varible to not be set properly
diff --git a/shell/docker-push.sh b/shell/docker-push.sh
index 9348e8cd..d8efac66 100644
--- a/shell/docker-push.sh
+++ b/shell/docker-push.sh
@@ -15,8 +15,7 @@ echo "---> docker-push.sh"
 set -ue -o pipefail
 docker --version
 echo "Pushing image: $CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG"
-docker_push_command="docker push" \
-    "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG"
+docker_push_command="docker push $CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG"
 echo "$docker_push_command"
 eval "$docker_push_command"
 echo "---> docker-push.sh ends"