Merge "Remove autorelease 4c 32G label no longer used"

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 543f84bcfc9f4bffee495b341c7a5a434b255ccf..8efe2f4ebde9b5a7c582224a0f926ce5315d5344 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -99,6 +99,27 @@
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
 
+- project:
+    name: controller-sonarcloud
+    jobs:
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+
+    project: 'controller'
+    project-name: 'controller-sonarcloud'
+    branch: master
+    build-node: centos7-builder-8c-8g
+    java-version: 'openjdk11'
+    mvn-settings: 'controller-settings'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
+    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
 - project:
     name: controller-view
     views:

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index ff0a29c189e547365afbe994b0a7019541a22f16..1bb62ec5ee0e3b13eda8fb21834b61003dfbe405 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -40,6 +40,11 @@ netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-magnesium,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-magnesium,

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 6768e4ce61d7183abc2b0841cf4a3e475e64c9bb..0298a769f059996d85013d6da47ac6546e8e7794 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -490,7 +490,6 @@
           only-critical: false
       - integration-csit-archive-build
       - integration-csit-run-postscript
-      - releng-openstack-stack-delete
 
 - publisher:
     name: integration-csit-archive-build

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 84a1f5ed181e794befea8685ba7acf123a143fc8..e7fc425672fabbe68ed4a6aca4b8605bc8b97c07 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -318,8 +318,10 @@
     os-cmp-cnt: 0
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+      - sodium:
+          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
 

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f7fe12edd2ab1150b16b5d6e71c21802782c68ab..5d2b2e7e2e2ca8a01ef154759f4f349b6a29195c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -10,7 +10,7 @@
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'

diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
index a02fbb9dc183ce9ee910faef5ebde12d353a187c..46ba2451c7dd40333c1eae124d0c774de07d11fb 100644 (file)
--- a/jjb/opflex/opflex-thirdparty-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -11,7 +11,7 @@
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
           disable-job: true
 
     project: 'opflex'

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 5cc90942a1b03814e7119bca2486fae01ec3640a..f0ab2920287edc70354f7cd1f69c746ded0bc62e 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -14,7 +14,7 @@
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.1.0'
-          openvswitch-version: '2.6.7'
+          openvswitch-version: '2.12.0'
       - sodium:
           branch: 'stable/sodium'
           libuv-version: '1.8.0'

diff --git a/jjb/opflex/scripts/openvswitch-build.sh b/jjb/opflex/scripts/openvswitch-build.sh
index f93afe536107c50834bee5b0782edd0f2a31257f..61ae9b4b8abb8fd381b203adc80c29cf067666ac 100644 (file)
--- a/jjb/opflex/scripts/openvswitch-build.sh
+++ b/jjb/opflex/scripts/openvswitch-build.sh
@@ -25,7 +25,7 @@ mkdir -p "$DESTDIR"
 make -j4
 DESTDIR=$(pwd)/$DESTDIR make install
 
-if [[ $OPENVSWITCH_VERSION =~ 2.6.7 ]]; then
+if [[ $OPENVSWITCH_VERSION =~ 2.12.0 ]]; then
     mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openvswitch/*.h $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openflow $DESTDIR/$ROOT/include/openvswitch

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index e106e25599771e2f16ddef198f5ba0c298292aba..f2d8ed89cb4ef4763fbc3c75a788da13b67f3f75 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -250,24 +250,6 @@
     builders:
       - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi'
 
-- publisher:
-    name: releng-openstack-stack-delete
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - shell: |
-                    #!/bin/bash -l
-                    echo "Deleting $STACK_NAME"
-                    openstack stack delete --yes "$STACK_NAME"
-          mark-unstable-if-failed: false
-
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by OpenDaylight infra.