From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 28 Jan 2021 12:28:09 +0000 (+0000)
Subject: Merge "Upgrade packer version 1.6.6"
X-Git-Tag: v0.61.0~6
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=3b887734bb2bc6cf09b29cd39e6d99706ef57531;hp=-c;p=releng%2Fglobal-jjb.git

Merge "Upgrade packer version 1.6.6"
---

3b887734bb2bc6cf09b29cd39e6d99706ef57531
diff --combined jjb/lf-ci-jobs.yaml
index 0e95e0fd,e65b0487..14fb9fc0
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@@ -30,7 -30,7 +30,7 @@@
      submodule-disable: false
      packer-builder: openstack
      packer-cloud-settings: packer-cloud-env
-     packer-version: 1.4.2
+     packer-version: 1.6.6
  
      #####################
      # Job Configuration #
@@@ -1572,14 -1572,6 +1572,14 @@@
                    pattern: 'packer\/templates\/{templates}\.json'
                  - compare-type: REG_EXP
                    pattern: 'packer\/vars\/{platforms}\.json'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/provision\/{templates}\.yaml'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/provision\/local-{templates}\.yaml'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/templates\/{templates}\.json'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
  
  - job-template:
      name: "{project-name}-packer-merge-{platforms}-{templates}"
@@@ -1637,11 -1629,6 +1637,11 @@@
              - 'packer\/provision\/local-{templates}\.yaml'
              - 'packer\/templates\/{templates}\.json'
              - 'packer\/vars\/{platforms}\.json'
 +            - 'packer\/common-packer\/provision\/{templates}\.yaml'
 +            - 'packer\/common-packer\/provision\/local-{templates}\.yaml'
 +            - 'packer\/common-packer\/templates\/{templates}\.json'
 +            - 'packer\/common-packer\/vars\/{platforms}\.json'
 +
            white-list-target-branches:
              - "{branch}"
  
@@@ -1702,14 -1689,6 +1702,14 @@@
                    pattern: 'packer\/templates\/{templates}\.json'
                  - compare-type: REG_EXP
                    pattern: 'packer\/vars\/{platforms}\.json'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/provision\/{templates}\.yaml'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/provision\/local-{templates}\.yaml'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/templates\/{templates}\.json'
 +                - compare-type: REG_EXP
 +                  pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
  
  - job-template:
      name: "{project-name}-packer-verify-build-{platforms}-{templates}"
@@@ -1758,10 -1737,6 +1758,10 @@@
              - 'packer\/provision\/local-{templates}\.yaml'
              - 'packer\/templates\/{templates}\.json'
              - 'packer\/vars\/{platforms}\.json'
 +            - 'packer\/common-packer\/vars\/{platforms}\.json'
 +            - 'packer\/common-packer\/provision\/{templates}\.yaml'
 +            - 'packer\/common-packer\/provision\/local-{templates}\.yaml'
 +            - 'packer\/common-packer\/templates\/{templates}\.json'
  
  #################
  # Packer Verify #