Merge "Update global-jjb to v0.25.1"

diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml
index e33b942..b8775b8 100644 (file)
--- a/jjb/ci-management/ci-packer.yaml
+++ b/jjb/ci-management/ci-packer.yaml
@@ -4,6 +4,7 @@
     jobs:
       - gerrit-packer-verify
 
+    packer-version: 1.2.5
     project: ci-management
     project-name: ci-management
     build-node: centos7-builder-2c-1g
@@ -13,6 +14,7 @@
     jobs:
       - gerrit-packer-merge
 
+    packer-version: 1.2.5
     project: ci-management
     project-name: ci-management
     build-node: centos7-builder-2c-1g
@@ -27,6 +29,7 @@
     jobs:
       - gerrit-packer-merge
 
+    packer-version: 1.2.5
     project: ci-management
     project-name: ci-management
     build-node: centos7-builder-2c-1g

diff --git a/packer/common-packer b/packer/common-packer
index 49b8bab..6961de6 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 49b8babff7bc2b1bdbd7ae56e61d3eac73f23165
+Subproject commit 6961de60eb1b20375b7b6839f05bff9deed6f621