summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2022-09-29 10:32:49 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2022-09-29 10:39:22 -0700
commit2197d45863af3496355dda957fabed01be445a8f (patch)
tree367e1c47c936ed14bf257fd9bd4d156f97ec8453 /jjb
parent786430fd064efc8b11ad90e58929debb7cfb5e21 (diff)
Chore: Update CLM jobs to run only on master
As requested in the TSC (Sep29), all CLM jobs should only be executed on the master branch. More in IT-24622 Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org> Change-Id: If33ed94f7a4a71d79d4a226ef0e973e886955cfb
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-aai-common.yaml2
-rw-r--r--jjb/aai/aai-babel.yaml2
-rw-r--r--jjb/aai/aai-graphadmin.yaml2
-rw-r--r--jjb/aai/aai-graphgraph.yaml2
-rw-r--r--jjb/aai/aai-logging-service.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml2
-rw-r--r--jjb/aai/aai-resources.yaml2
-rw-r--r--jjb/aai/aai-rest-client.yaml2
-rw-r--r--jjb/aai/aai-schema-service.yaml2
-rw-r--r--jjb/aai/aai-sparky-be.yaml2
-rw-r--r--jjb/aai/aai-traversal.yaml2
-rw-r--r--jjb/ccsdk/apps.yaml4
-rw-r--r--jjb/ccsdk/ccsdk-oran.yaml4
-rw-r--r--jjb/ccsdk/cds.yaml4
-rw-r--r--jjb/ccsdk/distribution.yaml4
-rw-r--r--jjb/ccsdk/features.yaml4
-rw-r--r--jjb/ccsdk/parent.yaml6
-rw-r--r--jjb/ccsdk/sli.yaml4
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml2
-rw-r--r--jjb/optf/optf-has.yaml2
-rw-r--r--jjb/optf/optf-osdf.yaml2
-rw-r--r--jjb/policy/policy-apex-pdp.yaml6
-rw-r--r--jjb/policy/policy-api.yaml6
-rw-r--r--jjb/policy/policy-clamp.yaml4
-rw-r--r--jjb/policy/policy-common.yaml6
-rw-r--r--jjb/policy/policy-distribution.yaml6
-rw-r--r--jjb/policy/policy-docker-base-common.yaml6
-rw-r--r--jjb/policy/policy-drools-applications.yaml6
-rw-r--r--jjb/policy/policy-drools-pdp.yaml6
-rw-r--r--jjb/policy/policy-gui.yaml4
-rw-r--r--jjb/policy/policy-models.yaml6
-rw-r--r--jjb/policy/policy-pap.yaml6
-rw-r--r--jjb/policy/policy-parent.yaml4
-rw-r--r--jjb/policy/policy-xacml-pdp.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-be-common.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-helm-validator.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml2
-rw-r--r--jjb/sdc/sdc.yaml2
-rw-r--r--jjb/sdnc/sdnc-apps.yaml4
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml4
-rw-r--r--jjb/sdnc/sdnc-oam.yaml4
-rw-r--r--jjb/so/so.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-functest.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml2
50 files changed, 0 insertions, 168 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index f5f44f018..4af6105e2 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -65,8 +65,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-params: '-P spring-boot-2-1'
mvn-settings: 'aai-aai-common-settings'
mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index b55d06a96..e7512930c 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -69,8 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-babel-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
java-version: openjdk11
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 593a6aa47..9cd9b7d3e 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -66,8 +66,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-graphadmin-settings'
mvn-version: 'mvn35'
java-version: openjdk8
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index dc9a63fdc..160f0a710 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -59,8 +59,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-graphgraph-settings'
- project:
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index f211a2656..7f771bffe 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -56,8 +56,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-logging-service-settings'
- project:
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index cc3b665ea..aade6d39b 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -69,8 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-model-loader-settings'
mvn-version: 'mvn36'
java-version: openjdk11
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index b8eb752b0..378dd3449 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -70,8 +70,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-resources-settings'
mvn-version: 'mvn35'
java-version: openjdk8
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 45bdd0aaa..a96c7f0a0 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -56,8 +56,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-rest-client-settings'
- project:
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 663dc3b02..80f588102 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -67,8 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-schema-service-settings'
mvn-version: 'mvn36'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index e86672f96..125001144 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -68,8 +68,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-sparky-be-settings'
mvn-version: 'mvn36'
java-version: openjdk11
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 1e8f38228..f586437df 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -69,8 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'aai-traversal-settings'
mvn-version: 'mvn35'
java-version: openjdk8
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 399c1bca5..ab933262a 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -82,10 +82,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-apps-settings'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 0f9b104ab..75c02d9e1 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -53,10 +53,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-oran-settings'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index e5e575bb5..2646caff1 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -114,10 +114,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index fac1cbe07..a119eb2a4 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -72,10 +72,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 1d3f6cc30..7ffdc36a5 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -70,10 +70,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-features-settings'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 14aaa4f6b..bbc8e2bc7 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -59,12 +59,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 36165e7fd..26145f96b 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -69,10 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-sli-settings'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 988d38387..b786da67a 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -91,8 +91,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-params: '-f multivimbroker/pom.xml'
mvn-settings: 'multicloud-framework-settings'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 686a8d69b..0ce5372c9 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -86,8 +86,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'multicloud-openstack-vmware-settings'
disabled: true
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index f78ca6d7e..088b1f1ee 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -164,8 +164,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'multicloud-openstack-settings'
- project:
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index cb524824a..8fcd743b8 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -66,8 +66,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'optf-has-settings'
- project:
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 0022aff27..4fb02f366 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -67,8 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'optf-osdf-settings'
- project:
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 54c6a5c77..db00457a7 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -73,12 +73,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-apex-pdp-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 0378b893a..cf814269b 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -67,12 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-api-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 331540db7..303a1d26a 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -68,10 +68,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-clamp-settings'
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 9b9069890..abcf1e017 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -58,12 +58,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-common-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 53404fd5c..02eaaa4ef 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -67,12 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-distribution-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 74c90118b..e77343a4b 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -48,12 +48,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-docker-settings'
mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
java-version: openjdk11
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7cbce5688..f29fddbe8 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -69,12 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-drools-applications-settings'
mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
java-version: openjdk11
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 6153fe91a..3d2dde745 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -68,12 +68,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-drools-pdp-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index f7306937d..6c43884a3 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -66,10 +66,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-gui-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 7bfdc8f8e..f6e760812 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -67,12 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-models-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index f0e647338..71275e4e6 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -67,12 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-pap-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index bf54cd098..9dc0b060d 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -39,10 +39,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-parent-settings'
java-version: openjdk11
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index cdddf2f22..40dffbac5 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -67,12 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'policy-xacml-pdp-settings'
java-version: openjdk11
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index d365db5a5..a89a4a511 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -58,8 +58,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdc-sdc-be-common-settings'
- project:
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 32d9507fb..7f9caf54e 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -81,8 +81,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdc-sdc-distribution-client-settings'
java-version: openjdk11
diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 39010d320..0f527b469 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -74,6 +74,4 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdc-sdc-helm-validator-settings'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 9b0c252b7..3e23fcf00 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -62,8 +62,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdc-sdc-tosca-settings'
java-version: openjdk11
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index e4eff9dec..fc570f0e3 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -71,8 +71,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
java-version: openjdk11
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 46b4b79ea..bcf384c69 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -112,8 +112,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-version: 'mvn36'
mvn-settings: 'sdc-settings'
java-version: openjdk11
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 732771735..85d4e78c5 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -107,10 +107,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
java-version: openjdk11
mvn-version : "mvn38"
mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 6c834a01d..75bf5e6e5 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -69,10 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdnc-northbound-settings'
java-version: openjdk11
mvn-version: 'mvn38'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index e09e3ec8b..e277cdc7e 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -70,10 +70,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'sdnc-oam-settings'
java-version: openjdk11
mvn-version: 'mvn38'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 510e10879..1eb3c0651 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -101,8 +101,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
mvn-settings: 'so-settings'
- project:
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 49c7c019d..abeee9a63 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -84,6 +84,4 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 19c88c39b..2e2cfad0e 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -39,6 +39,4 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'vnfsdk-functest-settings'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 519c4471f..556c40de9 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -70,8 +70,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'vnfsdk-refrepo-settings'
- project:
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 4364220f5..f8232f855 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -64,8 +64,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
mvn-settings: 'vnfsdk-validation-settings'
- project: