From bfbe854b38c96250603ce84646f25fc5b2aa3336 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Sun, 8 May 2022 16:15:25 -0700 Subject: [PATCH] Add missing chlorine branch Update mvn38 version Remove old patch jobs Change-Id: Id072d776b745d7d25a9362227dc6a465574f92c1 Signed-off-by: Luis Gomez --- jjb/aaa/aaa-patch-test.yaml | 44 -------------- jjb/bgpcep/bgpcep-patch-test.yaml | 36 ------------ jjb/controller/controller-patch-test.yaml | 29 ---------- jjb/genius/genius-patch-test.yaml | 39 ------------- .../distribution/distribution-jobs.yaml | 47 +++++++++++---- .../distribution/distribution-templates.yaml | 4 +- jjb/integration/integration-templates.yaml | 10 ++-- jjb/integration/integration-test-jobs.yaml | 42 +++++++------- jjb/l2switch/l2switch-patch-test.yaml | 33 ----------- jjb/netconf/netconf-patch-test.yaml | 26 --------- jjb/netvirt/netvirt-patch-test.yaml | 57 ------------------- jjb/neutron/neutron-patch-test.yaml | 4 ++ jjb/odltools/odltools-patch-test.yaml | 23 -------- .../openflowplugin-patch-test.yaml | 4 ++ jjb/ovsdb/ovsdb-patch-test.yaml | 4 ++ jjb/serviceutils/serviceutils-patch-test.yaml | 4 ++ jjb/yangtools/yangtools-patch-test.yaml | 26 --------- 17 files changed, 81 insertions(+), 351 deletions(-) delete mode 100644 jjb/aaa/aaa-patch-test.yaml delete mode 100644 jjb/bgpcep/bgpcep-patch-test.yaml delete mode 100644 jjb/controller/controller-patch-test.yaml delete mode 100644 jjb/genius/genius-patch-test.yaml delete mode 100644 jjb/l2switch/l2switch-patch-test.yaml delete mode 100644 jjb/netconf/netconf-patch-test.yaml delete mode 100644 jjb/netvirt/netvirt-patch-test.yaml delete mode 100644 jjb/odltools/odltools-patch-test.yaml delete mode 100644 jjb/yangtools/yangtools-patch-test.yaml diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml deleted file mode 100644 index 71ecff87f..000000000 --- a/jjb/aaa/aaa-patch-test.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: aaa-patch-test - jobs: - - inttest-patch-test - - project: "aaa" - - stream: - - chlorine: - branch: "master" - java-version: "openjdk11" - - sulfur: - branch: "stable/sulfur" - java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - java-version: "openjdk11" - - silicon: - branch: "stable/silicon" - java-version: "openjdk11" - - os-branch: "queens" - - feature: - - authn: - csit-list: > - aaa-csit-1node-authn-all-{stream} - - - keystone: - csit-list: > - aaa-csit-1node-keystone-all-{stream} - - - netvirt: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - - cluster-netvirt: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - - genius: - csit-list: > - genius-csit-1node-gate-only-{stream} diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml deleted file mode 100644 index d7a2658dd..000000000 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- project: - name: bgpcep-patch-test - jobs: - - inttest-mri-patch-test - - # The project name - project: "bgpcep" - - # Project branches - stream: - - chlorine: - branch: "master" - java-version: "openjdk11" - - sulfur: - branch: "stable/sulfur" - java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - java-version: "openjdk11" - - silicon: - branch: "stable/silicon" - java-version: "openjdk11" - - karaf-version: bgpcep - - feature: - - bgp: - csit-list: > - bgpcep-csit-1node-gate-userfeatures-all-{stream}, - bgpcep-csit-1node-gate-bgp-ingest-mixed-all-{stream} - - - pcep: - csit-list: > - bgpcep-csit-1node-gate-userfeatures-all-{stream}, - bgpcep-csit-1node-gate-throughpcep-all-{stream} diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml deleted file mode 100644 index 9a7b7e9c9..000000000 --- a/jjb/controller/controller-patch-test.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- project: - name: controller-patch-test - jobs: - - inttest-patch-test - - project: "controller" - - stream: - - chlorine: - branch: "master" - java-version: "openjdk11" - - sulfur: - branch: "stable/sulfur" - java-version: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - java-version: "openjdk11" - - silicon: - branch: "3.0.x" - java-version: "openjdk11" - - feature: - - core: - csit-list: > - controller-csit-1node-akka1-all-{stream}, - controller-csit-1node-rest-cars-perf-all-{stream}, - controller-csit-3node-clustering-ask-all-{stream}, - controller-csit-3node-clustering-tell-all-{stream} diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml deleted file mode 100644 index 6e3f8f552..000000000 --- a/jjb/genius/genius-patch-test.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: genius-patch-test - jobs: - - inttest-patch-test - - project: "genius" - - stream: - - master: - branch: "master" - java-version: "openjdk11" - - os-branch: "rocky" - - feature: - - netvirt: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - - cluster-netvirt: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - - netvirt-itm-direct-tunnels: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream} - - - genius: - csit-list: > - genius-csit-1node-gate-only-{stream} - - - cluster: - csit-list: > - genius-csit-3node-gate-only-{stream} - - - tdd-wip: - csit-list: > - genius-csit-1node-tdd-wip-only-{stream} diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 19f56c546..07696753b 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -24,12 +24,18 @@ nexus-iq-stage: release email-upstream: "[int/dist]" stream: - - sulfur: + - chlorine: branch: "master" + mvn-version: mvn38 + - sulfur: + branch: "stable/sulfur" + mvn-version: mvn38 - phosphorus: branch: "stable/phosphorus" + mvn-version: mvn35 - silicon: branch: "stable/silicon" + mvn-version: mvn35 - project: name: distribution-managed @@ -55,32 +61,39 @@ dist-pom: "distribution/pom.xml" stream: - - sulfur: + - chlorine: branch: "master" + mvn-version: mvn38 + dependencies: > + daexim-maven-merge-{stream}, + jsonrpc-maven-merge-{stream}, + lispflowmapping-maven-merge-{stream}, + openflowplugin-maven-merge-{stream}, + ovsdb-maven-merge-{stream}, + serviceutils-maven-merge-{stream}, + - sulfur: + branch: "stable/sulfur" + mvn-version: mvn38 dependencies: > - bgpcep-maven-merge-{stream}, daexim-maven-merge-{stream}, jsonrpc-maven-merge-{stream}, lispflowmapping-maven-merge-{stream}, - netconf-maven-merge-{stream}, - neutron-maven-merge-{stream}, openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, - phosphorus: branch: "stable/phosphorus" + mvn-version: mvn35 dependencies: > - bgpcep-maven-merge-{stream}, daexim-maven-merge-{stream}, jsonrpc-maven-merge-{stream}, lispflowmapping-maven-merge-{stream}, - netconf-maven-merge-{stream}, - neutron-maven-merge-{stream}, openflowplugin-maven-merge-{stream}, ovsdb-maven-merge-{stream}, serviceutils-maven-merge-{stream}, - silicon: branch: "stable/silicon" + mvn-version: mvn35 dependencies: > bgpcep-maven-merge-{stream}, daexim-maven-merge-{stream}, @@ -113,16 +126,24 @@ karaf-version: odl dist-pom: "distribution/opendaylight/pom.xml" stream: - - sulfur: + - chlorine: branch: "master" + mvn-version: mvn38 + dependencies: > + distribution-merge-managed-{stream}, + - sulfur: + branch: "stable/sulfur" + mvn-version: mvn38 dependencies: > distribution-merge-managed-{stream}, - phosphorus: branch: "stable/phosphorus" + mvn-version: mvn35 dependencies: > distribution-merge-managed-{stream}, - silicon: branch: "stable/silicon" + mvn-version: mvn35 dependencies: > distribution-merge-managed-{stream}, @@ -145,12 +166,18 @@ staging-profile-id: 2af042ed81d5e2 stream: - - sulfur: + - chlorine: branch: "master" + mvn-version: mvn38 + - sulfur: + branch: "stable/sulfur" + mvn-version: mvn38 - phosphorus: branch: "stable/phosphorus" + mvn-version: mvn35 - silicon: branch: "stable/silicon" + mvn-version: mvn35 - project: name: distribution-sonar diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index e6d4acced..98538816e 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -175,7 +175,7 @@ - lf-update-java-alternatives: java-version: "{java-version}" - maven-target: - maven-version: mvn38 + maven-version: "{mvn-version}" pom: pom.xml goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -329,7 +329,7 @@ - distribution-karaf-version: karaf-version: "{karaf-version}" - maven-exec: - maven-version: mvn38 + maven-version: "{mvn-version}" scm: - integration-gerrit-scm: diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 4e90f52cc..8bc06a782 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1868,7 +1868,7 @@ default: "all" description: "Specific feature test for patch" - maven-exec: - maven-version: mvn35 + maven-version: "{mvn-version}" scm: - integration-gerrit-scm: @@ -1904,7 +1904,7 @@ - lf-update-java-alternatives: java-version: "{java-version}" - maven-target: - maven-version: mvn35 + maven-version: "{mvn-version}" pom: "{project}/pom.xml" goals: | clean install dependency:tree @@ -1970,7 +1970,7 @@ default: "all" description: "Specific feature test for patch" - maven-exec: - maven-version: mvn35 + maven-version: "{mvn-version}" scm: - integration-gerrit-scm: @@ -2006,7 +2006,7 @@ - lf-update-java-alternatives: java-version: "{java-version}" - maven-target: - maven-version: mvn35 + maven-version: "{mvn-version}" pom: "{project}/pom.xml" goals: | clean install dependency:tree @@ -2024,7 +2024,7 @@ global-settings: global-settings global-settings-type: cfp - maven-target: - maven-version: mvn35 + maven-version: "{mvn-version}" pom: distribution/pom.xml goals: | clean install dependency:tree diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index b8996c102..52e45fe6e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -21,23 +21,23 @@ stream: - chlorine: branch: "master" - mvn-version: "mvn35" + mvn-version: "mvn38" java-version: "openjdk11" csit-list: !include: csit-jobs-chlorine.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - sulfur: branch: "stable/sulfur" - mvn-version: "mvn35" + mvn-version: "mvn38" java-version: "openjdk11" csit-list: !include: csit-jobs-sulfur.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - phosphorus: branch: "stable/phosphorus" @@ -45,9 +45,9 @@ java-version: "openjdk11" csit-list: !include: csit-jobs-phosphorus.lst build-order: > - odlparent infrautils yangtools mdsal controller serviceutils aaa netconf - daexim jsonrpc ovsdb neutron openflowplugin lispflowmapping - bgpcep integration/distribution + odlparent infrautils yangtools mdsal controller aaa netconf bgpcep + serviceutils daexim jsonrpc ovsdb openflowplugin lispflowmapping + integration/distribution - silicon: branch: "stable/silicon" @@ -74,8 +74,8 @@ - chlorine: branch: "master" csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp yangtools gate longevity sanity tdd tempest wip bgpcep-csit-3node-bgpclustering-all bgpcep-csit-3node-bgpclustering-ha-only @@ -87,8 +87,8 @@ - sulfur: branch: "stable/sulfur" csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp yangtools gate longevity sanity tdd tempest wip bgpcep-csit-3node-bgpclustering-all bgpcep-csit-3node-bgpclustering-ha-only @@ -100,8 +100,8 @@ - phosphorus: branch: "stable/phosphorus" csit-blocklist: > - aaa bier controller dluxapps genius lispflowmapping l2switch mdsal nemo - netconf netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools + aaa controller dluxapps genius lispflowmapping l2switch mdsal + netconf netvirt odlmicro sxp yangtools gate longevity sanity tdd tempest wip bgpcep-csit-3node-bgpclustering-all bgpcep-csit-3node-bgpclustering-ha-only @@ -303,7 +303,7 @@ - integration-distribution-git-url: git-url: "{git-url}" - maven-exec: - maven-version: mvn35 + maven-version: "{mvn-version}" scm: - integration-gerrit-scm: @@ -345,7 +345,7 @@ - lf-update-java-alternatives: java-version: "{java-version}" - maven-target: - maven-version: "mvn35" + maven-version: "{mvn-version}" pom: "$GERRIT_PROJECT/pom.xml" goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -360,7 +360,7 @@ global-settings: global-settings global-settings-type: cfp - maven-target: - maven-version: mvn35 + maven-version: "{mvn-version}" pom: distribution/pom.xml goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -442,7 +442,7 @@ - lf-infra-maven-parameters: mvn-opts: "" mvn-params: "" - mvn-version: mvn35 + mvn-version: "{mvn-version}" staging-profile-id: "" # Staging repos do not make sense for this job wrappers: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml deleted file mode 100644 index 160824f79..000000000 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: l2switch-patch-test - jobs: - - inttest-patch-test - - # The project name - project: "l2switch" - disable-job: true - - # Project branches - stream: - - chlorine: - branch: "master" - jre: "openjdk11" - - sulfur: - branch: "stable/sulfur" - jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" - - silicon: - branch: "stable/silicon" - jre: "openjdk11" - - os-branch: "queens" - - feature: - - all: - csit-list: > - l2switch-csit-1node--host-scalability-daily-only-{stream}, - l2switch-csit-1node-scalability-all-{stream}, - l2switch-csit-1node-switch-all-{stream} diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml deleted file mode 100644 index 1b8bdc648..000000000 --- a/jjb/netconf/netconf-patch-test.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- project: - name: netconf-patch-test - jobs: - - inttest-mri-patch-test - - project: "netconf" - - stream: - - master: - branch: "master" - java-version: "openjdk11" - - silicon: - branch: "stable/silicon" - java-version: "openjdk11" - - os-branch: "queens" - - karaf-version: netconf - - feature: - - core: - csit-list: > - netconf-csit-1node-gate-userfeatures-all-{stream}, - netconf-csit-1node-gate-userfeatures-rfc8040-all-{stream}, - netconf-csit-1node-gate-callhome-only-{stream} diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml deleted file mode 100644 index bbd07554f..000000000 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: netvirt-patch-test - jobs: - - inttest-patch-test - - project: "netvirt" - - stream: - - master: - branch: "master" - java-version: "openjdk11" - - os-branch: "rocky" - - jdk: "openjdk8" - - feature: - - current: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - cluster-current: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - cluster-minimal-current: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-minimal-cluster-{stream} - - snat-conntrack: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream} - - cluster-snat-conntrack: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-snat-conntrack-{stream} - - l2gw: - csit-list: > - netvirt-csit-hwvtep-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream} - - tdd-wip: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream} - - itm-direct-tunnels: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream} - - upgrade: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-upgrade-{stream} - - tempest: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream} - - cluster-tempest: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-{stream} - - tempest-snat-conntrack: - csit-list: > - netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream} - - cluster-tempest-snat-conntrack: - csit-list: > - netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-tempest-stateful-snat-conntrack-{stream} diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 007a6cd01..6da152ad4 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -9,12 +9,16 @@ stream: - chlorine: branch: "master" + mvn-version: "mvn38" - sulfur: branch: "stable/sulfur" + mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" + mvn-version: "mvn35" - silicon: branch: "stable/silicon" + mvn-version: "mvn35" os-branch: "queens" diff --git a/jjb/odltools/odltools-patch-test.yaml b/jjb/odltools/odltools-patch-test.yaml deleted file mode 100644 index 18a1d929e..000000000 --- a/jjb/odltools/odltools-patch-test.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- project: - name: odltools-patch-test - jobs: - - inttest-patch-test - - project: odltools - jdk: openjdk8 - - stream: - - chlorine: - branch: "master" - - sulfur: - branch: "stable/sulfur" - - phosphorus: - branch: "stable/phosphorus" - - silicon: - branch: "stable/silicon" - - feature: - - current: - csit-list: > - odltools-csit-1node-gate-all-{stream} diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 8aafddc1a..a5bc62aae 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -12,15 +12,19 @@ - chlorine: branch: "master" java-version: "openjdk11" + mvn-version: "mvn38" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" + mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" + mvn-version: "mvn35" - silicon: branch: "stable/silicon" java-version: "openjdk11" + mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index c331a9107..32e484f92 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -11,15 +11,19 @@ - chlorine: branch: "master" java-version: "openjdk11" + mvn-version: "mvn38" - sulfur: branch: "stable/sulfur" java-version: "openjdk11" + mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" java-version: "openjdk11" + mvn-version: "mvn35" - silicon: branch: "stable/silicon" java-version: "openjdk11" + mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index 1d241209d..a04f4782b 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -9,12 +9,16 @@ stream: - chlorine: branch: "master" + mvn-version: "mvn38" - sulfur: branch: "stable/sulfur" + mvn-version: "mvn38" - phosphorus: branch: "stable/phosphorus" + mvn-version: "mvn35" - silicon: branch: "stable/silicon" + mvn-version: "mvn35" os-branch: "queens" jdk: "openjdk8" diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml deleted file mode 100644 index c59532580..000000000 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- project: - name: yangtools-patch-test - jobs: - - inttest-patch-test - - project: "yangtools" - - stream: - - chlorine: - branch: "master" - jre: "openjdk11" - - sulfur: - branch: "stable/sulfur" - jre: "openjdk11" - - phosphorus: - branch: "stable/phosphorus" - jre: "openjdk11" - - silicon: - branch: "6.0.x" - jre: "openjdk11" - - feature: - - core: - csit-list: > - yangtools-csit-1node-system-only-{stream} -- 2.36.6