From 3bc367a4cad1b304609d9403190a097612173dbd Mon Sep 17 00:00:00 2001
From: Daniel Farrell <dfarrell@redhat.com>
Date: Fri, 26 May 2017 17:12:24 -0400
Subject: [PATCH] Add ansible-opendaylight test jobs

Change-Id: I911ff41623739782261aef909774f8f30e2732e9
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---
 jjb/packaging/ansible.yaml   | 95 ++++++++++++++++++++++++++++++++++++
 jjb/packaging/packaging.yaml | 74 ----------------------------
 2 files changed, 95 insertions(+), 74 deletions(-)
 create mode 100644 jjb/packaging/ansible.yaml

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
new file mode 100644
index 0000000000..f45e1ad9e6
--- /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 8e1ef5c232..0b6b08ab7c 100644
--- 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'
-- 
2.36.6