From: Anil Belur <abelur@linuxfoundation.org>
Date: Sat, 23 Jan 2021 01:41:25 +0000 (+1000)
Subject: Revert "Remove the -only CLI option for packer build"
X-Git-Tag: v0.60.3^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=8b0974bca7d163cf322c978efdf7b9d1dd2e265a;p=releng%2Fglobal-jjb.git

Revert "Remove the -only CLI option for packer build"

This reverts commit c6d9571b076faf5d02305bd93faeda7bf23fe766.

Based on the input provided on the Gihub packer issue
hard-coded for our parser to be able to decode the rest of the config
properly."

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I58debd1a961b92c3f7705a3f65a8bc883722596a
---

diff --git a/releasenotes/notes/remove-packer-build-only-flag-2b5a53cf34dc9c6d.yaml b/releasenotes/notes/remove-packer-build-only-flag-2b5a53cf34dc9c6d.yaml
deleted file mode 100644
index 78ead642..00000000
--- a/releasenotes/notes/remove-packer-build-only-flag-2b5a53cf34dc9c6d.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-fixes:
-  - |
-    Remove the -only CLI option for packer build
-
-    The #CR 90dd675df482a8 submitted with common-packer v0.7.0
-    fails to build packer jobs because of a bug in the packer build CLI.
-
-    The `-only` option packer build CLI does not set the cloud provider
-    name/type as per the documentation. The alternative is to use an environment
-    variable that is passed through the packer job and can be reference in the
-    packer templates.
-
-    Ref:
-    Github Issue: https://github.com/hashicorp/packer/issues/10495
diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 1a44e4fd..73e74965 100644
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -63,6 +63,7 @@ fi
 set +x
 
 packer.io build -color=false \
+    -only "${PACKER_BUILDER}" \
     -var-file="$CLOUDENV" \
     -var-file="$platform_file" \
     "templates/$PACKER_TEMPLATE.json"