Merge "Add CentOS8 images to the jenkins-config"

diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh
index ecb8472c45bde549b9c57dc737e4a99de224ded5..abfde5b9c66fa29e3f48571d3fe9bf091efbe96c 100755 (executable)
--- a/jjb/autorelease/update-autorelease-projects-views.sh
+++ b/jjb/autorelease/update-autorelease-projects-views.sh
@@ -55,7 +55,7 @@ EOF
 
 for module in "${modules[@]}"; do
     echo "Include project:$module to autorelease view"
-    echo "      - '$module-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
+    echo "      - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
 done
 echo "    <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE"
 

diff --git a/jjb/autorelease/validate-autorelease-aluminium.yaml b/jjb/autorelease/validate-autorelease-aluminium.yaml
index c58822c8cbe2973b06753ff3f73b61b5558558e9..44dff335252e39050d4f652c3ae6702f5e70c3b7 100644 (file)
--- a/jjb/autorelease/validate-autorelease-aluminium.yaml
+++ b/jjb/autorelease/validate-autorelease-aluminium.yaml
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: aluminium
-    branch: master
+    branch: stable/aluminium
     project-name:
       - aaa:
           project: aaa

diff --git a/jjb/autorelease/validate-autorelease-silicon.yaml b/jjb/autorelease/validate-autorelease-silicon.yaml
new file mode 100644 (file)
index 0000000..e96b3c6
--- /dev/null
+++ b/jjb/autorelease/validate-autorelease-silicon.yaml
@@ -0,0 +1,35 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-silicon
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: silicon
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - 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
index 56fb982433670f63be98d196e83db64709e33e37..6f7af118768698b7b662ff7eb25be1b1e4720de8 100644 (file)
--- a/jjb/autorelease/view-autorelease-aluminium.yaml
+++ b/jjb/autorelease/view-autorelease-aluminium.yaml
@@ -22,17 +22,17 @@
     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'
-      - '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'
+      - 'aaa-maven-merge-aluminium'
+      - 'bgpcep-maven-merge-aluminium'
+      - 'daexim-maven-merge-aluminium'
+      - 'genius-maven-merge-aluminium'
+      - 'integration/distribution-maven-merge-aluminium'
+      - 'jsonrpc-maven-merge-aluminium'
+      - 'lispflowmapping-maven-merge-aluminium'
+      - 'netconf-maven-merge-aluminium'
+      - 'netvirt-maven-merge-aluminium'
+      - 'neutron-maven-merge-aluminium'
+      - 'openflowplugin-maven-merge-aluminium'
+      - 'ovsdb-maven-merge-aluminium'
+      - 'serviceutils-maven-merge-aluminium'
     <<: *releng_autorelease_view_common_aluminium

diff --git a/jjb/autorelease/view-autorelease-silicon.yaml b/jjb/autorelease/view-autorelease-silicon.yaml
new file mode 100644 (file)
index 0000000..858c90f
--- /dev/null
+++ b/jjb/autorelease/view-autorelease-silicon.yaml
@@ -0,0 +1,38 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_silicon
+    name: releng-view-autorelease-silicon
+    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-Silicon
+    description: 'List of Silicon Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-maven-merge-silicon'
+      - 'bgpcep-maven-merge-silicon'
+      - 'daexim-maven-merge-silicon'
+      - 'genius-maven-merge-silicon'
+      - 'integration/distribution-maven-merge-silicon'
+      - 'jsonrpc-maven-merge-silicon'
+      - 'lispflowmapping-maven-merge-silicon'
+      - 'netconf-maven-merge-silicon'
+      - 'netvirt-maven-merge-silicon'
+      - 'neutron-maven-merge-silicon'
+      - 'openflowplugin-maven-merge-silicon'
+      - 'ovsdb-maven-merge-silicon'
+      - 'serviceutils-maven-merge-silicon'
+    <<: *releng_autorelease_view_common_silicon

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index b099fbea43983f1049900b253e89e0b4d670f96c..32314b263266c9c44b440000563b138798d7fb53 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -204,9 +204,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 6ad41ede1e7de0d473162a1c9651ccdd0f623463..6082d6f7e2219096876bc52a12deb0c2697c8fb1 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -105,6 +105,7 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
+    java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m'