From: Anil Belur <abelur@linuxfoundation.org>
Date: Sat, 23 Jan 2021 01:37:14 +0000 (+1000)
Subject: Revert "Pass the builder type to verify jobs"
X-Git-Tag: v0.60.3~1^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?p=releng%2Fglobal-jjb.git;a=commitdiff_plain;h=e860cc760f59822c38484ef252c7690937caf9a7

Revert "Pass the builder type to verify jobs"

This reverts commit e0a9d10d3d6b488ed3a3b00050b34d9faee4a6f8.

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: If7162ced328d58b24ab9339f7e81d7dff76c90bb
---

diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst
index 955e224c..1ea2cfaf 100644
--- a/docs/jjb/lf-macros.rst
+++ b/docs/jjb/lf-macros.rst
@@ -127,7 +127,6 @@ Run `packer build` to build system images.
     :packer-version: Version of packer to use.
     :platform: Build platform as found in the vars directory.
     :template: Packer template to build as found in the templates directory.
-    :packer-builder: builder type to use. ex: aws, openstack (default: openstack)
 
 :Optional parameters:
 
@@ -146,7 +145,6 @@ Run ``packer validate`` to verify packer configuration.
     :packer-cloud-settings: Cloud configuration file. Loaded on the build
         server as CLOUDENV environment variable.
     :packer-version: Version of packer to use.
-    :packer-builder: builder type to use. ex: aws, openstack (default: openstack)
 
 lf-infra-push-gerrit-patch
 --------------------------
diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 689892bf..39ebc8f2 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1781,7 +1781,6 @@
           openstack: "{openstack}"
           openstack-cloud: "{openstack-cloud}"
           packer-cloud-settings: "{packer-cloud-settings}"
-          packer-builder: "{packer-builder}"
           packer-version: "{packer-version}"
 
 - job-template:
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 9f740462..f5021d26 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -158,7 +158,6 @@
               variable: CLOUDENV
       - inject:
           properties-content: |
-            PACKER_BUILDER={packer-builder}
             PACKER_VERSION={packer-version}
       - shell: !include-raw-escape:
           - ../shell/packer-install.sh
diff --git a/releasenotes/notes/pass-packer-builder-type-to-verify-jobs-396e0f450143f6c1.yaml b/releasenotes/notes/pass-packer-builder-type-to-verify-jobs-396e0f450143f6c1.yaml
deleted file mode 100644
index 530506e5..00000000
--- a/releasenotes/notes/pass-packer-builder-type-to-verify-jobs-396e0f450143f6c1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-fixes:
-  - |
-    Pass the builder type to verify jobs
-
-    The default builder type must be passed to packer verify jobs. For
-    packer jobs to run on aws, set the `packer-builder: aws` in downstream
-    CI-management repositories.
diff --git a/shell/packer-build.sh b/shell/packer-build.sh
index 4cb3df32..1a44e4fd 100644
--- a/shell/packer-build.sh
+++ b/shell/packer-build.sh
@@ -21,7 +21,6 @@ PACKER_LOGS_DIR="$WORKSPACE/archives/packer"
 PACKER_BUILD_LOG="$PACKER_LOGS_DIR/packer-build.log"
 mkdir -p "$PACKER_LOGS_DIR"
 export PATH="${WORKSPACE}/bin:$PATH"
-export PACKER_BUILDER=${PACKER_BUILDER:-openstack}
 
 cd packer
 
diff --git a/shell/packer-validate.sh b/shell/packer-validate.sh
index af766c3c..61e14313 100644
--- a/shell/packer-validate.sh
+++ b/shell/packer-validate.sh
@@ -19,7 +19,6 @@ set -eu -o pipefail
 PACKER_LOGS_DIR="$WORKSPACE/archives/packer"
 mkdir -p "$PACKER_LOGS_DIR"
 export PATH="${WORKSPACE}/bin:$PATH"
-export PACKER_BUILDER=${PACKER_BUILDER:-openstack}
 
 cd packer
 varfiles=(vars/*.json common-packer/vars/*.json)