From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Tue, 25 Jul 2017 13:22:49 +0000 (-0700)
Subject: Remove unneeded JJB variable from packer templates
X-Git-Tag: v0.5.2^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=04163ad187f5da1063953ff301da2761c65d304e;p=releng%2Fglobal-jjb.git

Remove unneeded JJB variable from packer templates

Gerrit Iaccaa906980eb077676a3dc4b9100a91ec65f8c0 /
commit 91d975d5c426a08e82d8a6bbe1e298fa82f2b7b5 removed an unneeded
variable from the packer scripts but it wasn't removed from the top
level macros.

Change-Id: I893e25429c5aab45fcabdf3853e752e2f12dcf36
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 5c5ab846..0a5d7713 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -123,12 +123,10 @@
     # Adds builders section common to merge packer jobs.
     builders:
       - lf-infra-packer-validate:
-          os-cloud-file-id: '{os-cloud-file-id}'
           packer-version: '{packer-version}'
       - lf-infra-packer-build:
           platform: '{platforms}'
           template: '{templates}'
-          os-cloud-file-id: '{os-cloud-file-id}'
           packer-version: '{packer-version}'
 
 - lf_packer_verify_builders: &lf_packer_verify_builders
@@ -136,7 +134,6 @@
     name: lf-packer-verify-builders
     builders:
       - lf-infra-packer-validate:
-          os-cloud-file-id: '{os-cloud-file-id}'
           packer-version: '{packer-version}'
 
 - parameter:
diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 20a5c6b8..310e0fe1 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -94,8 +94,6 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: '{os-cloud-file-id}'
-              target: '$HOME/.config/openstack/clouds.yaml'
             - file-id: 'packer-cloud-env'
               variable: 'CLOUDENV'
       - inject:
diff --git a/test.template b/test.template
index c21533ff..f49d54e0 100644
--- a/test.template
+++ b/test.template
@@ -49,7 +49,6 @@
         - "{project-name}-packer-jobs"
 
     project-name: gerrit-ciman
-    os-cloud-file-id: os-cloud-id
     platforms:
       - centos
       - ubuntu1604
@@ -91,7 +90,6 @@
         - "{project-name}-github-packer-jobs"
 
     project-name: github-ciman
-    os-cloud-file-id: os-cloud-id
     platforms:
       - centos
       - ubuntu1604