Merge "trigger distribution build for Neon SR1 release"

diff --git a/global-jjb b/global-jjb
index 24a51c7182b868b57317f820dd8222f55274bc4d..343c22493055e0aa72968dc722c20a26bbbee725 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 24a51c7182b868b57317f820dd8222f55274bc4d
+Subproject commit 343c22493055e0aa72968dc722c20a26bbbee725

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
index 5c435bfa13d70aecd438b5f4ff1b853df22bf8d3..184dbc9a9c0e98b453c1cb2cb5f4ad3c0356be81 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240
 HARDWARE_ID=odl-standard-1

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
new file mode 100644 (file)
index 0000000..11a9c3e
--- /dev/null
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -0,0 +1,68 @@
+---
+- project:
+    name: alt-datastores-sodium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: alt-datastores
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-alt-datastores/82146/
+          rtd-token: ea1d83487d47ead46fa99256fad3213ec30c8c43
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'alt-datastores'
+    project-name: 'alt-datastores'
+    branch: 'master'
+    mvn-settings: 'alt-datastores-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: daa2b00117ed6
+
+- project:
+    name: alt-datastores-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: alt-datastores
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-alt-datastores/82146/
+          rtd-token: ea1d83487d47ead46fa99256fad3213ec30c8c43
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'alt-datastores'
+    project-name: 'alt-datastores'
+    branch: 'stable/neon'
+    mvn-settings: 'alt-datastores-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: daa2b00117ed6
+
+- project:
+    name: alt-datastores-sonar
+    jobs:
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+
+    project: 'alt-datastores'
+    project-name: 'alt-datastores'
+    branch: 'master'
+    mvn-settings: 'alt-datastores-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: alt-datastores-view
+    views:
+      - project-view
+    project-name: alt-datastores

diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst
index a003f9afa00b85035534a181bc088dccc0d188ea..54c85496b26da70480a0b64d29cdce9db409c3f6 100644 (file)
--- a/jjb/integration/csit-jobs-neon.lst
+++ b/jjb/integration/csit-jobs-neon.lst
@@ -59,5 +59,4 @@ ovsdb-csit-1node-upstream-southbound-all-neon,
 ovsdb-csit-3node-upstream-clustering-only-neon,
 sfc-csit-3node-docker-full-deploy-all-neon,
 sfc-csit-3node-rest-basic-all-neon,
-telemetry-csit-1node-basic-all-neon,
 yangtools-csit-1node-system-only-neon,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
index 7b7e06b8c6ab448766cdf41f7a0a8c059864c647..dada617223354454f1d34716227597756f067905 100644 (file)
--- a/jjb/integration/csit-jobs-sodium.lst
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -57,5 +57,4 @@ ovsdb-csit-1node-upstream-southbound-all-sodium,
 ovsdb-csit-3node-upstream-clustering-only-sodium,
 sfc-csit-3node-docker-full-deploy-all-sodium,
 sfc-csit-3node-rest-basic-all-sodium,
-telemetry-csit-1node-basic-all-sodium,
 yangtools-csit-1node-system-only-sodium,

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 6ab50cfb389161cf82ca817635beb5ce7ae02033..e3147f335e64e9ca9a2161064aa92606f4ce3906 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -1,8 +1,13 @@
-CONTROLLERMEM="3072m"
-ACTUALFEATURES="odl-integration-all"
-
 if [[ ! -z "${CONTROLLERFEATURES}" ]]; then
     ACTUALFEATURES="odl-integration-all,${CONTROLLERFEATURES}"
+else
+    ACTUALFEATURES="odl-integration-all"
+fi
+
+if [[ "${JOB_NAME}" == *"distribution-sanity"* ]]; then
+    CONTROLLERMEM="4096m"
+else
+    CONTROLLERMEM="3072m"
 fi
 
 echo "Kill any controller running"

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 054d441c6961e42cec1a901e85b0ca15b5e13d53..b12ff84cedc63ccc1e53456de67f5f3668ed59f1 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -395,7 +395,7 @@
     # This job works for both managed & self-managed distro.
 
     project-type: freestyle
-    node: centos7-builder-4c-4g
+    node: centos7-builder-2c-8g
     concurrent: false
 
     properties:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 1ec062844a68694e46bfa6f364b372f006fd97f0..1fc683f89f7431085df1819c155217fdea341c23 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -81,7 +81,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190403-205252.587'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -187,7 +187,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190403-205252.587'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -490,7 +490,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190403-205252.587'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job Configuration #
@@ -599,7 +599,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190403-205252.587'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -1042,7 +1042,7 @@
     openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #
@@ -1454,7 +1454,7 @@
     openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
 
     #####################
     # Job configuration #

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 0be42e844daaa83da341124fb2009c04d7fbb2b7..c8754673b92abb3b210360459145324a193272e6 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -5,7 +5,7 @@
     project-name: integration-test
     jobs:
       - 'integration-patch-test-{stream}'
-      - 'integration-multipatch-test-{stream}'
+      - 'inttest-multipatch'
       - 'integration-merge-dashboard'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -60,10 +60,9 @@
       - sodium:
           branch: 'master'
           csit-blacklist: >
-              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
-              l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
-              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
-              aaa-csit-1node-keystone-all
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
@@ -74,10 +73,9 @@
       - neon:
           branch: 'stable/neon'
           csit-blacklist: >
-              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
-              l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
-              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
-              aaa-csit-1node-keystone-all
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
@@ -88,10 +86,9 @@
       - fluorine:
           branch: 'stable/fluorine'
           csit-blacklist: >
-              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
-              l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
-              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
-              aaa-csit-1node-keystone-all
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
@@ -359,12 +356,13 @@
 
 
 - job-template:
-    name: 'integration-multipatch-test-{stream}'
+    name: '{prefix}integration-multipatch-test-{stream}'
     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
     # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
     # it creates a distribution containing all patches and triggers the distribution test job which includes most
     # (if not all) available CSIT jobs.
 
+    id: inttest-multipatch
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
@@ -375,14 +373,28 @@
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - patches-to-build-parameter:
-          patches_to_build: '$PATCHES_TO_BUILD'
-      - build-order-parameter:
-          build-order: '{build-order}'
-      - build-fast-parameter:
-          build-fast: 'false'
-      - run-test-parameter:
-          run-test: 'false'
+      - string:
+          name: PATCHES_TO_BUILD
+          default: '$PATCHES_TO_BUILD'
+          description: |
+              Ordered list of patches to build in the format of project=changeset (checkout) or
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
+      - string:
+          name: BUILD_ORDER
+          default: '{build-order}'
+          description: 'Build order for multipatch test when topic is used'
+      - string:
+          name: BUILD_FAST
+          default: 'true'
+          description: 'Set true to build fast -Pq'
+      - string:
+          name: BUILD_NORMAL
+          default: ''
+          description: 'List of projects to build normal (no -Pq) when BUILD_FAST=true'
+      - string:
+          name: RUN_TEST
+          default: 'false'
+          description: 'Set true to run test after build'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index d02a42421a0cd204232277968b39018aaba4c8a4..87dd099f63e26d5ad5e03029656727dd09b5ffac 100755 (executable)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -37,11 +37,6 @@ if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then
     fi
     PATCHES_TO_BUILD=${PATCHES_TO_BUILD#*:}
 fi
-if ${BUILD_FAST}; then
-    fast_option="-Pq"
-else
-    fast_option=""
-fi
 # check if topic exists:
 # if topic=binding-rpc, then checkout first patch in binding-rpc topic (if it exists)
 # if topic:binding-rpc, then cherry-pick first patch in binding-rpc topic (if it exists)
@@ -205,6 +200,12 @@ fi
 # Second phase: build everything
 
 for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
+    # Set Fast build if project is not in BUILD_NORMAL and BUILD_FAST is true
+    if [[ "${BUILD_NORMAL}" != *"${PROJECT_SHORTNAME}"* ]] && ${BUILD_FAST}; then
+        fast_option="-Pq"
+    else
+        fast_option=""
+    fi
     pushd "${PROJECT_SHORTNAME}"
     # Build project
     "$MVN" clean install \

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 07d01ba20d93bfeafa4cf635134c3435e671ae4a..fdea58fa3b49cb5fe58b0c206864e8eb401241e9 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -145,7 +145,8 @@
     name: lf-infra-lftools
     jobs:
       - '{project-name}-rtd-jobs'
-      - gerrit-release-announce
+      - gerrit-release-announce:
+          build-node: centos7-builder-2c-1g
       - gerrit-tox-verify
 
     project-name: lf-infra-lftools

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index cb652a30e9e0c2bc09546715b4a754aea1a4d026..32a9e84cb8f54dbf1a54fd61787e217d52aa7bb8 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -16,7 +16,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190416-121444.608
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -65,7 +65,7 @@
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190416-121444.608
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 22b40f4e03d5921637114e8b4a75b6d7d23c5a70..87e5a05966746178c823db5d1486abfc55322081 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -49,7 +49,7 @@
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
+          schedule: '{schedule-weekly}'
           tools_system_count: 3
       - tempest-stateful:
           test-suites: 'openstack/tempest/tempest.robot'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
index a96aeb92aea9df265f9fd86671116893d4454ad2..3338d6ec4bd28e6bf2724375d49a786fc5f54fb5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
@@ -23,7 +23,7 @@
 
     # Job images
     tools_system_count: 2
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index b7f322e54310cc41a7416a0ac22351b3d62b0f62..fe6b1cde99298adf575e8e1cdee235fd222ab888 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -24,7 +24,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 2d1b48091c1dec966e294242ecae5875dbe9381b..c863948f0d6015bafbfaa3d9115eeb59893b10f9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 8def413783794f1502358cfedeef56d604f44991..2a77f8d02b5c1dc7451caa0ca56f0bf48a579701 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 736f080570edfadc2dd2122030ba186a42930465..2722546b8f3d06924a8c86fb7986b73ad88f4002 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 7820b795ff83f9233cef95acbd577673c2f4deb4..44935b9b290fa0185eba57c419b34e10b08008c1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -26,7 +26,7 @@
           scope: 'all'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index ef3a6ec22ee20804ebdab6af70608e701314c2ca..665120745048d76b992c20c44ffb1427a4b041de 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -25,7 +25,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 947a34406738f08006827128b7b1ab92abe3a5da..4b29ac7176d0fd140172ce18bbc12160538c913d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 566a6b01f8b6848c44bed98aaa8505a1b85f03a7..1acb68f595d9b81e709ef84d2611035d45785748 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index c69615b3927c0108b56c0871f4e88916742079c3..04a8bc21e920d7c6259d636df610875de695155d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -25,7 +25,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index ba7bc2b594ae341e86e0727e8ec4dacc9c5a0561..bff54f26f8d49b93cf995292ba4cd74cc00c9609 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -24,7 +24,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index be686f303cc602c7b6814606b7b50a3e126a3a9f..139cde214e0d074ba0f2a3b4db43010ded0f127c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -24,7 +24,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 2eafdfe3b666b9de6eade70f06e96093c3494441..58fe8cd60f7b1315bc3cf5e31a881cd43784f36a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index bdf2513567ee9778e3f903b3ca0dd22cd6eb3817..d5f5ce40fb00d3c90b79589e3cd4da63bfcdd02f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -120,10 +120,3 @@
     views:
       - project-view
     project-name: 'openflowplugin'
-
-- project:
-    name: openflowplugin-fluorine-view
-    views:
-      - common-view
-    view-name: 'openflowplugin-flourine'
-    view-regex: '^openflowplugin-.*-fluorine'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8b35fbf77a2b46bd8202baf73851a9677052fb5c..071ca8bc4fea7a6c9c8006659b097525a329eb0e 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -8,6 +8,8 @@
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
       - gerrit-jenkins-cfg-merge:
           jenkins-silos: releng sandbox
+      - gerrit-jenkins-cfg-verify:
+          jenkins-silos: releng sandbox
       - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
       - gerrit-jjb-merge:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7c0a9164318df0009cc234580f8e560e593c383e..e106e25599771e2f16ddef198f5ba0c298292aba 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -59,41 +59,6 @@
               further details.
               https://docs.openstack.org/developer/python-openstackclient/
 
-- parameter:
-    name: patches-to-build-parameter
-    parameters:
-      - string:
-          name: PATCHES_TO_BUILD
-          default: ''
-          description: |
-              Ordered list of patches to build in the format of project=changeset (checkout) or
-              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
-              A topic is also allowed, for example: topic=binding-tlc-rpc
-
-- parameter:
-    name: build-order-parameter
-    parameters:
-      - string:
-          name: BUILD_ORDER
-          default: '{build-order}'
-          description: 'Build order for multipatch test when topic is used'
-
-- parameter:
-    name: build-fast-parameter
-    parameters:
-      - string:
-          name: BUILD_FAST
-          default: '{build-fast}'
-          description: 'Set true to build fast -Pq'
-
-- parameter:
-    name: run-test-parameter
-    parameters:
-      - string:
-          name: RUN_TEST
-          default: '{run-test}'
-          description: 'Set true to run test after build'
-
 - parameter:
     name: distribution-branch-to-build-parameter
     parameters:

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
deleted file mode 100644 (file)
index 7cbab29..0000000
--- a/packer/provision/mininet-ovs-2.5.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash -x
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-# force any errors to cause the script and job to end in failure
-set -xeu -o pipefail
-
-# Ensure that necessary variables are set to enable noninteractive mode in
-# commands.
-export DEBIAN_FRONTEND=noninteractive
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
-echo '---> Install OpenVSwitch 2.5.0'
-apt-get update -m
-apt-get install openvswitch-switch openvswitch-vtep
-
-# Temporary workaround required to bring up OVS
-# post-install without which OVS daemon exits.
-service openvswitch-switch restart
-# Verify the OVS service status
-service openvswitch-switch status
-
-echo '---> Installing mininet'
-apt-get install mininet
-
-echo '---> Installing build pre-requisites'
-apt-get install build-essential snmp libsnmp-dev snmpd libpcap-dev \
-autoconf make automake libtool libconfig-dev libssl-dev libffi-dev libssl-doc pkg-config
-
-git clone https://github.com/intracom-telecom-sdn/mtcbench.git
-mtcbench/deploy/docker/provision.sh
-# TODO: remove workaround for build issue with mtcbench
-# when mtcbench dependency build correctly
-# https://github.com/intracom-telecom-sdn/mtcbench/issues/10
-mtcbench/build_mtcbench.sh || true
-cd mtcbench/oflops/cbench
-make
-cp cbench /usr/local/bin/
-
-echo '---> Installing exabgp'
-apt-get install exabgp
-
-# Install vlan for vlan based tests in VTN suites
-apt-get install vlan
-
-# Install netaddr package which is needed by some custom mininet topologies
-apt-get install python-netaddr

diff --git a/packer/provision/mininet-ovs-2.5.yaml b/packer/provision/mininet-ovs-2.5.yaml
new file mode 100644 (file)
index 0000000..9de3df3
--- /dev/null
+++ b/packer/provision/mininet-ovs-2.5.yaml
@@ -0,0 +1,69 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+
+  pre_tasks:
+    - include_role: name=lfit.system-update
+
+  tasks:
+    - name: 'Install OpenVSwitch {{ovs_version}}'
+      block:
+        - name: 'Install dependencies required for OpenVSwitch {{ovs_version}}'
+          apt: 'name={{item}} state=present'
+          with_items:
+            - dh-autoreconf
+            - debhelper
+            - autoconf
+            - automake
+            - libssl-dev
+            - pkg-config
+            - bzip2
+            - openssl
+            - python-all
+            - procps
+            - python-qt4
+            - python-zopeinterface
+            - python-twisted-conch
+          become: true
+        - name: 'Install OpenVSwitch {{ovs_version}}'
+          apt: 'name={{item}} state=present'
+          with_items:
+            - openvswitch-switch
+            - openvswitch-vtep
+          become: true
+        - name: Enable openvswitch-switch service
+          systemd:
+            name: openvswitch-switch
+            enabled: true
+            masked: false
+          become: true
+        - name: Enable openvswitch-vtep service
+          systemd:
+            name: openvswitch-vtep
+            enabled: true
+            masked: false
+          become: true
+
+    - name: Install Mininet
+      apt: name=mininet state=present
+      become: true
+
+    - name: Install exabgp
+      apt: name=exabgp state=present
+      become: true
+
+    - name: Install vlan for vlan based tests in VTN suites
+      apt: name=vlan state=present
+      become: true
+
+    - name: Install python-netaddr for custom mininet topologies
+      apt: name=python-netaddr state=present
+      become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true

diff --git a/packer/provision/mininet-ovs-2.6.sh b/packer/provision/mininet-ovs-2.6.sh
deleted file mode 100644 (file)
index 6673762..0000000
--- a/packer/provision/mininet-ovs-2.6.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash -x
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-# force any errors to cause the script and job to end in failure
-set -xeu -o pipefail
-
-# Ensure that necessary variables are set to enable noninteractive mode in
-# commands.
-export DEBIAN_FRONTEND=noninteractive
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
-echo '---> Install OpenVSwitch 2.6.1'
-apt-get update -m
-apt-get install dh-autoreconf debhelper autoconf automake libssl-dev pkg-config bzip2 openssl python-all procps python-qt4 python-zopeinterface python-twisted-conch
-mkdir /root/ovs
-cd /root
-pwd
-wget http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz
-tar -xzvf openvswitch-2.6.1.tar.gz -C /root/ovs --strip-components=1
-cd /root/ovs
-DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
-cd /root
-dpkg -i openvswitch-common_2.6.1-1_amd64.deb openvswitch-switch_2.6.1-1_amd64.deb python-openvswitch_2.6.1-1_all.deb openvswitch-vtep_2.6.1-1_amd64.deb
-systemctl unmask openvswitch-switch
-service openvswitch-switch start
-service openvswitch-vtep start
-echo '---> Waiting 15 secs for services to start'
-sleep 15
-ovs-vsctl --version
-ovs-vsctl show
-# We want to see the entire ps output not just the pid
-# shellcheck disable=SC2009
-ps -elf | grep ovs
-# shellcheck disable=SC2009
-ps -elf | grep vtep
-echo '---> Finished installing OpenVSwitch 2.6.1'
-
-echo '---> Installing mininet'
-apt-get install mininet
-
-echo '---> Installing build pre-requisites'
-apt-get install build-essential snmp libsnmp-dev snmpd libpcap-dev \
-autoconf make automake libtool libconfig-dev libssl-dev libffi-dev libssl-doc pkg-config
-
-git clone https://github.com/intracom-telecom-sdn/mtcbench.git
-mtcbench/deploy/docker/provision.sh
-# TODO: remove workaround for build issue with mtcbench
-# when mtcbench dependency build correctly
-# https://github.com/intracom-telecom-sdn/mtcbench/issues/10
-mtcbench/build_mtcbench.sh || true
-cd mtcbench/oflops/cbench
-make
-cp cbench /usr/local/bin/
-
-echo '---> Installing exabgp'
-apt-get install exabgp
-
-# Install vlan for vlan based tests in VTN suites
-apt-get install vlan
-
-# Install netaddr package which is needed by some custom mininet topologies
-apt-get install python-netaddr

diff --git a/packer/provision/mininet-ovs-2.6.yaml b/packer/provision/mininet-ovs-2.6.yaml
new file mode 100644 (file)
index 0000000..6715b38
--- /dev/null
+++ b/packer/provision/mininet-ovs-2.6.yaml
@@ -0,0 +1,93 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+  vars:
+    ovs_version: 2.6.1
+    ovs_checksum: sha256:307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c
+
+  pre_tasks:
+    - include_role: name=lfit.system-update
+
+  tasks:
+    - name: 'Install OpenVSwitch {{ovs_version}}'
+      block:
+        - name: 'Install dependencies required for OpenVSwitch {{ovs_version}}'
+          apt: 'name={{item}} state=present'
+          with_items:
+            - dh-autoreconf
+            - debhelper
+            - autoconf
+            - automake
+            - libssl-dev
+            - pkg-config
+            - bzip2
+            - openssl
+            - python-all
+            - procps
+            - python-qt4
+            - python-zopeinterface
+            - python-twisted-conch
+          become: true
+        - name: Create OVS root
+          file:
+            path: /tmp/ovs
+            state: directory
+            mode: 0755
+        - name: 'Fetch OpenVSwitch {{ovs_version}} to /tmp'
+          get_url:
+            url: 'http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz'
+            dest: '/tmp/openvswitch-2.6.1.tar.gz'
+            checksum: '{{ovs_checksum}}'
+        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+          unarchive:
+            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            dest: /tmp/ovs
+            remote_src: true
+        - name: 'Build OpenVSwitch {{ovs_version}}'
+          shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
+          args:
+            chdir: '/tmp/ovs/openvswitch-{{ovs_version}}'
+        - name: 'Install OpenVSwitch {{ovs_version}}'
+          apt: 'deb={{item}}'
+          with_items:
+            - /tmp/ovs/openvswitch-common_2.6.1-1_amd64.deb
+            - /tmp/ovs/openvswitch-switch_2.6.1-1_amd64.deb
+            - /tmp/ovs/python-openvswitch_2.6.1-1_all.deb
+            - /tmp/ovs/openvswitch-vtep_2.6.1-1_amd64.deb
+          become: true
+        - name: Enable openvswitch-switch service
+          systemd:
+            name: openvswitch-switch
+            enabled: true
+            masked: false
+          become: true
+        - name: Enable openvswitch-vtep service
+          systemd:
+            name: openvswitch-vtep
+            enabled: true
+            masked: false
+          become: true
+
+    - name: Install Mininet
+      apt: name=mininet state=present
+      become: true
+
+    - name: Install exabgp
+      apt: name=exabgp state=present
+      become: true
+
+    - name: Install vlan for vlan based tests in VTN suites
+      apt: name=vlan state=present
+      become: true
+
+    - name: Install python-netaddr for custom mininet topologies
+      apt: name=python-netaddr state=present
+      become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 70a81d530552afc0b17d3cabf76c295435923f23..df2372f14e2ce70834aaef08d806b8d556248b9d 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_network": null,
@@ -9,19 +10,20 @@
   },
   "builders": [
     {
-      "type": "openstack",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `ssh_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "name": "vexxhost",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
-      "flavor": "v1-standard-1",
+      "type": "openstack",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
+      "ssh_username": "{{user `ssh_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "v1-standard-1",
       "metadata": {
         "ci_managed": "yes"
       }
@@ -31,12 +33,24 @@
     {
       "type": "shell",
       "scripts": [
-        "provision/baseline.sh",
-        "provision/mininet-ovs-2.5.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
+        "common-packer/provision/install-python.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    },
+    {
+      "type": "shell-local",
+      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}"
+    },
+    {
+      "type": "ansible",
+      "playbook_file": "provision/mininet-ovs-2.5.yaml",
+      "ansible_env_vars": [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=True",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+      ]
     }
   ]
 }

diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index bf203f4533c3ca397b6232c4066d396997443ec5..85a70be34f726b0737c4665579670512df447c00 100644 (file)
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.json
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_network": null,
@@ -9,19 +10,20 @@
   },
   "builders": [
     {
-      "type": "openstack",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `ssh_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "name": "vexxhost",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-26-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
-      "flavor": "v1-standard-1",
+      "type": "openstack",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
+      "ssh_username": "{{user `ssh_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "v1-standard-1",
       "metadata": {
         "ci_managed": "yes"
       }
@@ -31,12 +33,24 @@
     {
       "type": "shell",
       "scripts": [
-        "provision/baseline.sh",
-        "provision/mininet-ovs-2.6.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
+        "common-packer/provision/install-python.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    },
+    {
+      "type": "shell-local",
+      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}"
+    },
+    {
+      "type": "ansible",
+      "playbook_file": "provision/mininet-ovs-2.6.yaml",
+      "ansible_env_vars": [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=True",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=yaml"
+      ]
     }
   ]
 }