From: Luis Gomez Date: Sun, 28 Mar 2021 20:19:39 +0000 (-0700) Subject: JJB cleanup tasks X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F95585%2F5;p=releng%2Fbuilder.git JJB cleanup tasks - Do not run periodic netvirt CSIT (saves resources). - Remove OVSDB custom sonar job. Change-Id: I9ff61a7971629226e90d8fb423a4873c32d41041 Signed-off-by: Luis Gomez --- diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 508fc27a3..499fe826e 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -37,8 +37,7 @@ install-features: "odl-jolokia,odl-netvirt-openstack" functionality: - - upstream-stateful: - schedule: "{schedule-daily}" + - upstream-stateful - gate-stateful openstack: @@ -88,8 +87,7 @@ install-features: "odl-jolokia,odl-netvirt-openstack" functionality: - - upstream-stateful: - schedule: "{schedule-daily}" + - upstream-stateful - gate-stateful openstack: @@ -139,8 +137,7 @@ install-features: "odl-jolokia,odl-netvirt-openstack" functionality: - - upstream-stateful: - schedule: "{schedule-daily}" + - upstream-stateful - gate-stateful openstack: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 23af285fa..9a5064868 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -32,11 +32,9 @@ install-features: "odl-netvirt-openstack" functionality: - - upgrade: - schedule: "{schedule-weekly}" + - upgrade - upgrade-snat-conntrack: odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" openstack: - rocky: @@ -79,11 +77,9 @@ install-features: "odl-netvirt-openstack" functionality: - - upgrade: - schedule: "{schedule-weekly}" + - upgrade - upgrade-snat-conntrack: odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" openstack: - stein: @@ -130,11 +126,9 @@ install-features: "odl-netvirt-openstack" functionality: - - upgrade: - schedule: "{schedule-daily}" + - upgrade - upgrade-snat-conntrack: odl-snat-mode: "conntrack" - schedule: "{schedule-daily}" openstack: - stein: diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index f61e372df..3e79e321f 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -54,18 +54,15 @@ # 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-weekly}" tools_system_count: 3 enable-gre-type-driver: "yes" - tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" - schedule: "{schedule-daily}" - tempest-stateful-snat-conntrack: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" odl-snat-mode: "conntrack" - schedule: "{schedule-daily}" - gate-tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" @@ -138,18 +135,15 @@ # 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-weekly}" tools_system_count: 3 enable-gre-type-driver: "yes" - tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" - schedule: "{schedule-daily}" - tempest-stateful-snat-conntrack: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" odl-snat-mode: "conntrack" - schedule: "{schedule-daily}" - gate-tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" @@ -221,18 +215,15 @@ # 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-weekly}" tools_system_count: 3 enable-gre-type-driver: "yes" - tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" - schedule: "{schedule-weekly}" - tempest-stateful-snat-conntrack: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - gate-tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" @@ -306,18 +297,15 @@ # 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-weekly}" tools_system_count: 3 enable-gre-type-driver: "yes" - tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" - schedule: "{schedule-weekly}" - tempest-stateful-snat-conntrack: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" odl-snat-mode: "conntrack" - schedule: "{schedule-weekly}" - gate-tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" @@ -375,14 +363,11 @@ install-features: "odl-jolokia,odl-netvirt-openstack" functionality: - - upstream-stateful: - schedule: "{schedule-daily}" + - upstream-stateful - upstream-stateful-itm-direct-tunnels: enable-itm-direct-tunnels: "true" - schedule: "{schedule-daily}" - upstream-stateful-snat-conntrack: odl-snat-mode: "conntrack" - schedule: "{schedule-daily}" - gate-stateful - gate-stateful-itm-direct-tunnels: enable-itm-direct-tunnels: "true" @@ -394,20 +379,16 @@ testplan: "{project}-{topology}-dcgw-openstack.txt" tools_system_count: 3 enable-gre-type-driver: "yes" - schedule: "{schedule-daily}" # 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: "" - tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" - schedule: "{schedule-daily}" - tempest-stateful-snat-conntrack: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" odl-snat-mode: "conntrack" - schedule: "{schedule-daily}" - gate-tempest-stateful: test-suites: "openstack/tempest/tempest.robot" testplan: "{project}-{topology}-openstack-tempest.txt" diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml deleted file mode 100644 index 16bfa85a9..000000000 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ /dev/null @@ -1,114 +0,0 @@ ---- -- project: - name: ovsdb-sonar - jobs: - - "ovsdb-sonar" - - project: "ovsdb" - jdk: "openjdk11" - -- job-template: - name: "ovsdb-sonar" - - project-type: freestyle - node: centos7-docker-1c-4g - jdk: "{java-version}" - - properties: - - opendaylight-infra-properties: - build-days-to-keep: 7 - - parameters: - - opendaylight-infra-parameters: - os-cloud: "{os-cloud}" - project: "{project}" - branch: "{branch}" - refspec: "refs/heads/{branch}" - artifacts: "{archive-artifacts}" - - scm: - - git-scm: - refspec: "" - branch: "master" - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: "{build-timeout}" - - triggers: - - timed: "{schedule-saturday}" - - gerrit: - server-name: "{gerrit-server-name}" - trigger-on: - - comment-added-contains-event: - comment-contains-value: "run-sonar$" - projects: - - project-compare-type: "ANT" - project-pattern: "{project}" - branches: - - branch-compare-type: "ANT" - branch-pattern: "**/master" - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - shell: !include-raw-escape: setup-docker.sh - - inject: - properties-file: env.properties - - shell: !include-raw-escape: include-setup-hwvtep-docker.sh - - maven-target: - maven-version: "mvn35" - pom: "pom.xml" - goals: > - clean install dependency:tree -V -B -Dsonar - -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true - -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r - java-opts: - - "-Xmx1024m" - settings: "ovsdb-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - - inject: - properties-file: env.properties - - maven-target: - maven-version: "mvn35" - pom: "pom.xml" - goals: > - verify -V -B -Pintegrationtest -Dsonar - -Dskip.karaf.featureTest=true - -Dovsdb.controller.address=${{CONTROLLER_IP}} - -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r - properties: - - "ovsdbserver.ipaddress=127.0.0.1" - - "ovsdbserver.port=6641" - - "ovsdb.userspace.enabled=yes" - settings: "ovsdb-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - - maven-target: - maven-version: "mvn35" - # We should switch to the recommended configuration of sonar once - # JJB adds support for configurating the Sonar wrapper: - # http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins - goals: > - sonar:sonar -V -B -Djenkins -Dsonar - -Dsonar.host.url=https://sonar.opendaylight.org - -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r - settings: "ovsdb-settings" - settings-type: cfp - global-settings: "global-settings" - global-settings-type: cfp - - shell: !include-raw-escape: cleanup-docker.sh - - lf-jacoco-nojava-workaround - - publishers: - - email-notification: - email-recipients: "{email-recipients}" - email-prefix: "[ovsdb]" - - lf-jacoco-report - - lf-infra-publish diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 204857223..13250dcd5 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -80,6 +80,25 @@ # Used by the release job staging-profile-id: a68b188166958 +- project: + name: ovsdb-sonar + jobs: + - gerrit-maven-sonar + + project: "ovsdb" + project-name: "ovsdb" + branch: "master" + build-node: centos7-builder-2c-8g + build-timeout: 90 + java-version: "openjdk11" + mvn-settings: "ovsdb-settings" + mvn-goals: "clean deploy javadoc:aggregate" + 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: ovsdb-info jobs: