Merge "jjb reference non-existent demo dublin branch"

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 56ce45b..b80c811 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -7,7 +7,8 @@
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
           build-node: ubuntu1604-builder-8c-8g
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-release-version-java-daily':
           build-node: ubuntu1604-builder-8c-8g
 

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index bf4cdf5..94e7e2e 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
@@ -12,5 +12,5 @@
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:
-            - 'dcaegen2-services-master-bbs-event-processor-merge-java'
+            - 'dcaegen2-services-{stream}-bbs-event-processor-merge-java'
     robot-options: ''

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index 10c8d3e..b90b929 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -16,6 +16,10 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 14ebfc3..c2b72cf 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -15,6 +15,10 @@
           pom: 'artifactbroker/pom.xml'
           pattern: 'artifactbroker/**'
     jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 8a1ec57..40c79e6 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -16,6 +16,10 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
index 972535e..0066522 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -14,6 +14,10 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index c9151f7..9947419 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -62,6 +62,10 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
       - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'

diff --git a/jjb/oom/include-yaml-check.sh b/jjb/oom/include-yaml-check.sh
deleted file mode 100755 (executable)
index 27359e5..0000000
--- a/jjb/oom/include-yaml-check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# setting-up bash flags
-set -x -e -o pipefail
-
-# remove old ansible - current centos build minion
-# is quite old and using incompatible ansible 2.4.x
-sudo yum -y remove ansible
-sudo pip install ansible ansible-lint
-
-# perform check
-ansible --version
-ansible-lint --version
-ansible-lint ./ansible/site.yml -vvv

diff --git a/jjb/oom/offline-installer-review-bootstrap.sh b/jjb/oom/offline-installer-review-bootstrap.sh
new file mode 100644 (file)
index 0000000..f8454d2
--- /dev/null
+++ b/jjb/oom/offline-installer-review-bootstrap.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# setting-up bash flags
+set -x -e -o pipefail
+
+#Run review script
+./offline-installer-review.sh
+

diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index ca2f15f..7e462d2 100644 (file)
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -2,13 +2,13 @@
 - project:
     name: offline-installer
     project-name: 'offline-installer'
-    build-node: centos7-builder-2c-1g
-    offline_build_script: !include-raw-escape: include-yaml-check.sh
+    build-node: 'ubuntu1604-docker-8c-8g'
+    offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh
 
     stream:
       - 'master':
           branch: 'master'
 
     jobs:
-      - '{project-name}-{stream}-yaml-lint':
-          build_script: '{offline_build_script}'
+      - '{project-name}-{stream}-review':
+          build_script: '{offline_review_bootstrap}'

diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml
index 02eae3f..5f95f70 100644 (file)
--- a/jjb/oom/oom-jobs.yaml
+++ b/jjb/oom/oom-jobs.yaml
@@ -1,8 +1,8 @@
 ---
 - job-template:
-    name: '{project-name}-{stream}-yaml-lint'
+    name: '{project-name}-{stream}-review'
     node: '{build-node}'
-    type: freestyle
+    project-type: freestyle
     build_script: ''
     pattern: '**'
 

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 37ca313..c660e18 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -58,6 +58,7 @@
         name: libxml2-utils
         state: present
       become: true
+      when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
     - name: Install python-tox
       apt: