Merge "Update cloud image CentOS7 devstack x86_64"

[releng/builder.git] / jjb / odlparent / odlparent.yaml

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index b0b5a6ab26cbba5216b638dde32e113b4c794249..767042b309ede5af0c4cd96cc31a1636dff4a942 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -3,7 +3,7 @@
     name: odlparent-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
@@ -18,7 +18,6 @@
     branch: master
 
     mvn-settings: odlparent-settings
-    build-node: centos8-builder-4c-4g
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -37,7 +36,7 @@
     name: odlparent-12.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
@@ -52,41 +51,6 @@
     branch: 12.0.x
 
     mvn-settings: odlparent-settings
-    build-node: centos8-builder-4c-4g
-
-    dependencies: ""
-    email-upstream: "[odlparent]"
-    archive-artifacts: >
-      **/*.prop
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/hs_err_*.log
-      **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 880d5ac25eaa
-
-- project:
-    name: odlparent-11.0.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: odlparent
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
-          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 11.0.x
-    branch: 11.0.x
-
-    mvn-settings: odlparent-settings
-    build-node: centos8-builder-4c-4g
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -115,7 +79,7 @@
 - project:
     name: odlparent-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk17:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -126,16 +90,8 @@
     project: "odlparent"
     project-name: "odlparent"
     branch: "master"
-
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
-    mvn-version: mvn38
     mvn-settings: "odlparent-settings"
     mvn-opts: "-Xmx1024m"
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: odlparent-info