Merge "Migrate Ubuntu 16.04 docker image to common-packer"

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 2d8d34e3393cdc2f89ee12bfcfb56d9fe58a4e8e..6fc158fb26b2306e01c6e310fbb9fcc41f7b5df1 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -7,7 +7,10 @@
           build-timeout: 180
           cron: '@daily'
           mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          mvn-central: true
+          ossrh-profile-id: 6386ebbbf3a563
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
@@ -31,7 +34,10 @@
           build-timeout: 180
           cron: '@daily'
           mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          mvn-central: true
+          ossrh-profile-id: 6386ebbbf3a563
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
@@ -55,7 +61,10 @@
           build-timeout: 180
           cron: '@daily'
           mvn-goals: clean install -V -Dmaven.compile.fork=true
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          mvn-central: true
+          ossrh-profile-id: 6386ebbbf3a563
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180

diff --git a/packer/provision/devstack-pre-pip.yaml b/packer/provision/devstack-pre-pip.yaml
index b70b2bdfe12bbbaf839f2efdea1ec26859811ed3..cd31a6298a4f663bd45208850eb49c4b44f13908 100644 (file)
--- a/packer/provision/devstack-pre-pip.yaml
+++ b/packer/provision/devstack-pre-pip.yaml
@@ -65,9 +65,9 @@
           args:
             warn: False
         - name: "Install non-baseline requirements for {{ os_branch }}"
-          yum: 'name={{item}} state=present'
-          with_items:
-            - "{{ sed_output.stdout_lines }}"
+          yum:
+            name: "{{ sed_output.stdout_lines }}"
+            state: present
           become: true
         - name: git clone openstack core projects
           git: repo='https://github.com/openstack/{{ item }}.git'