Merge "Add upgrade tests job"

[releng/builder.git] / jjb / packaging / ansible.yaml

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index dcf221405e6bb85dec5aaf3abe7a261db730fc9b..7176d06a3d2386cd0c3e1ab1054efe093068ca0f 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -17,7 +17,7 @@
 - job-template:
     name: '{project-name}-test-rpm-{stream}'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-2g
 
     project-type: freestyle
 
@@ -44,15 +44,20 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: test-ansible-rpm.sh
+      - shell: !include-raw: setup-ansible-rpm.sh
+      - shell: !include-raw: test-ansible-rpm-default-config.sh
+      - shell: !include-raw: test-ansible-rpm-custom-config.sh
+      - shell: !include-raw: test-ansible-rpm-upgrade.sh
 
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
+
 
     publishers:
       - lf-infra-publish
@@ -60,7 +65,7 @@
 - job-template:
     name: '{project-name}-test-deb-{stream}'
 
-    node: ubuntu1604-mininet-ovs-25-2c-4g
+    node: ubuntu1604-mininet-ovs-25-1c-4g
 
     project-type: freestyle
 
@@ -87,15 +92,24 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: test-ansible-deb.sh
+      - shell: !include-raw: setup-ansible-deb.sh
+      - shell: !include-raw: test-ansible-deb-default-config.sh
+      - shell: !include-raw: test-ansible-deb-custom-config.sh
 
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     publishers:
       - lf-infra-publish
+
+- project:
+    name: ansible-view
+    views:
+      - project-view
+    project-name: ansible