Merge "Fix cleanup stale stacks job"

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
new file mode 100644 (file)
index 0000000..f45e1ad
--- /dev/null
+++ b/jjb/packaging/ansible.yaml
@@ -0,0 +1,95 @@
+---
+- project:
+    name: ansible
+    project-name: ansible
+
+    jobs:
+      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-test-rpm-{stream}'
+      - '{project-name}-test-deb-{stream}'
+
+    project: 'integration/packaging/ansible-opendaylight'
+
+    stream:
+      - master:
+          branch: 'master'
+
+- job-template:
+    name: '{project-name}-test-rpm-{stream}'
+
+    node: centos7-java-builder-2c-4g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '{project-name}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-ansible-rpm.sh
+
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+- job-template:
+    name: '{project-name}-test-deb-{stream}'
+
+    node: ubuntu1604-mininet-ovs-25-2c-4g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '{project-name}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-ansible-deb.sh
+
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 8e1ef5c232e338cd714845a5fed8fd97f60c2918..0b6b08ab7c90184f91ec7087078522cc0a4d7d9b 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -10,8 +10,6 @@
       - 'packaging-build-deb-{stream}'
       - 'packaging-test-rpm-{stream}'
       - 'packaging-test-deb-{stream}'
-      - 'packaging-test-ansible-rpm-{stream}'
-      - 'packaging-test-ansible-deb-{stream}'
 
     project: 'integration/packaging'
 
@@ -195,42 +193,6 @@
       - archive-artifacts:
           artifacts: '**'
 
-- job-template:
-    name: 'packaging-test-ansible-rpm-{stream}'
-
-    node: centos7-java-builder-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell: !include-raw: include-raw-test-ansible-rpm.sh
-
-    triggers:
-      - timed: '@daily'
-
-
 - job-template:
     name: 'packaging-build-deb-{stream}'
 
@@ -315,39 +277,3 @@
     publishers:
       - archive-artifacts:
           artifacts: 'packaging/deb/opendaylight/*.deb'
-
-
-- job-template:
-    name: 'packaging-test-ansible-deb-{stream}'
-
-    node: ubuntu1604-mininet-ovs-25-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell: !include-raw: include-raw-test-ansible-deb.sh
-
-    triggers:
-      - timed: '@daily'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index f7d78e20b77fd6311fc20fbd1b9bc5d88ee43bdb..c9a31fd01447f5a31263530aae6b05ababe54b48 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -76,7 +76,8 @@
       - string:
           name: PATCHES_TO_BUILD
           default: ''
-          description: 'csv list of patches in project:changeset format to build distribution with'
+          # yamllint disable-line rule:line-length
+          description: 'Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)'
 
 - parameter:
     name: run-test-parameter

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 723248165b8c2f0c3f1b3df5eb44fa7715e288e8..e0651b01552fa047ffdbeba862ac04c1d50f2a77 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -140,6 +140,8 @@ EOF
     yum install -y haveged
     systemctl enable haveged.service
 
+    # Install git-review
+    yum install -y git-review
 }
 
 ubuntu_systems() {

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index ad0ef81e2e242142bc3c5b0475ab17fc02df7f9a..57bcc1227314ab732de45b042158ae1d1377824c 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -19,9 +19,6 @@ yum install -y python34-{devel,virtualenv,setuptools,pip}
 # Install python dependencies, useful generally
 yum install -y python-{devel,virtualenv,setuptools,pip}
 
-# Use pip to install newer version of git-review
-pip install git-review --upgrade
-
 # Needed by autorelease scripts
 yum install -y xmlstarlet