Merge "Update cloud image"

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
deleted file mode 100644 (file)
index 9859e38..0000000
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204
-VOLUME_SIZE=150
-HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
deleted file mode 100644 (file)
index 6002366..0000000
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200601-154124.204
-VOLUME_SIZE=150
-HARDWARE_ID=odl-highcpu-8

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 217bdddcc184ce28cf0edc3ca6ac261a65a51a08..a1ab67240d25d3d05c23d53144427b6fb6de22b0 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -44,7 +44,8 @@
     builders:
       - shell: |
           #!/bin/bash -l
-          virtualenv --system-site-packages $WORKSPACE/venv
+          set -xe -o pipefail
+          virtualenv -p python3 --system-site-packages $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
           $PYTHON -m pip install --upgrade networkx

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 8557af447f38aa3a5bbb3adf9239fe331fdf9aa3..72cd0c6cd4fc83681a26cd8178484bf154258979 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,9 +5,8 @@
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
-      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
+          build-node: centos7-builder-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}'
 
     stream:
       - sodium:
@@ -42,7 +41,7 @@
     jobs:
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-4c-16g
+          build-node: centos7-builder-4c-16g
       - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
       - '{project-name}-validate-autorelease-{stream}'

diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
new file mode 100644 (file)
index 0000000..64322fa
--- /dev/null
+++ b/jjb/autorelease/validate-autorelease-aluminium.yaml
@@ -0,0 +1,37 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-aluminium
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: aluminium
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - infrautils:
+          project: infrautils
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils

diff --git a/jjb/autorelease/view-autorelease-aluminium.yaml b/jjb/autorelease/view-autorelease-aluminium.yaml
new file mode 100644 (file)
index 0000000..c44a919
--- /dev/null
+++ b/jjb/autorelease/view-autorelease-aluminium.yaml
@@ -0,0 +1,39 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_aluminium
+    name: releng-view-autorelease-aluminium
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
+
+- view:
+    name: Merge-Aluminium
+    description: 'List of Aluminium Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-merge-aluminium'
+      - 'bgpcep-merge-aluminium'
+      - 'daexim-merge-aluminium'
+      - 'genius-merge-aluminium'
+      - 'infrautils-merge-aluminium'
+      - 'integration/distribution-merge-aluminium'
+      - 'jsonrpc-merge-aluminium'
+      - 'lispflowmapping-merge-aluminium'
+      - 'netconf-merge-aluminium'
+      - 'netvirt-merge-aluminium'
+      - 'neutron-merge-aluminium'
+      - 'openflowplugin-merge-aluminium'
+      - 'ovsdb-merge-aluminium'
+      - 'serviceutils-merge-aluminium'
+    <<: *releng_autorelease_view_common_aluminium

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 9d254e29e587b2cb47657b2ea25369d917c7951f..50471c9faf8cbce346eb2162034f5fc77dad2fdc 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -47,7 +47,8 @@
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index f3043ec56379042fd679b4c551ddedce4a5956eb..d3ebc33969acb130014c1edeec48e8584f1101b0 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -189,6 +189,14 @@
 
     # Manual CSIT job lists used by sanity or periodic in nature.
     csit-mri-list-aluminium: >
+        controller-csit-1node-akka1-all-aluminium,
+        controller-csit-1node-benchmark-all-aluminium,
+        controller-csit-1node-rest-cars-perf-all-aluminium,
+        controller-csit-3node-benchmark-all-aluminium,
+        controller-csit-3node-clustering-ask-all-aluminium,
+        controller-csit-3node-clustering-tell-all-aluminium,
+        controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
+        controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
         yangtools-csit-1node-system-only-aluminium
     csit-mri-list-magnesium: >
         yangtools-csit-1node-system-only-magnesium

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 6f567cc50310dc9c096b83af36a79097ecbd3c52..501df4d290e968d6043259f8c8d569e7f3baaff5 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -62,8 +62,8 @@
       - aluminium:
           branch: 'master'
           csit-blacklist: >
-              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+              alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
+              nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               bgpcep-csit-3node-bgpclustering-all
               bgpcep-csit-3node-bgpclustering-ha-only