Merge "[SO] update the recursive orch branch in the SO build scripts"
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 2b6aff4..775f856 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -32,8 +32,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -80,8 +78,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index cf19550..5a61506 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -27,8 +27,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -52,8 +50,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index a24ce04..f0fd25f 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -26,8 +26,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -113,8 +111,8 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 8744061..4a24dd2 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -28,8 +28,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -71,8 +69,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 25f78e7..ba34b88 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -20,8 +20,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -69,8 +67,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 80a3d97..d3d780c 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -31,8 +31,6 @@
mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
- '{project-name}-gerrit-release-jobs':
mvn-params: '-Drevision=3.0.0'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -56,6 +54,8 @@
stream:
- 'master':
branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index c88f630..34f56cd 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -20,8 +20,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -68,8 +66,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index fb3e788..5d204dd 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -55,7 +55,11 @@
nexus-iq-namespace: 'onap-'
project: sdc/sdc-be-common
project-name: 'sdc-sdc-be-common'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
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 e20b954..9e7a5e1 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -78,7 +78,11 @@
nexus-iq-namespace: 'onap-'
project: sdc/sdc-distribution-client
project-name: 'sdc-sdc-distribution-client'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
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 5b87809..2477488 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -71,5 +71,9 @@
nexus-iq-namespace: 'onap-'
project: 'sdc/sdc-helm-validator'
project-name: 'sdc-sdc-helm-validator'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'sdc-sdc-helm-validator-settings'
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 5cfdc2f..c8aa37d 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -56,7 +56,11 @@
nexus-iq-namespace: 'onap-'
project: sdc/sdc-tosca
project-name: 'sdc-sdc-tosca'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'sdc-sdc-tosca-settings'
- project:
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 2547e6b..41a1bb0 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -65,7 +65,11 @@
project: sdc/sdc-workflow-designer
project-name: 'sdc-sdc-workflow-designer'
build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
- project:
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bba93f0..184f6f0 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -109,7 +109,11 @@
project: sdc
project-name: 'sdc'
build-node: ubuntu1804-docker-8c-8g
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
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 6c843ce..f7c7d69 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -36,8 +36,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -106,6 +104,8 @@
stream:
- 'master':
branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-version : "mvn36"
mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index cc21503..4c16882 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -15,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 80c9dfd..9447158 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -17,8 +17,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -68,6 +66,8 @@
stream:
- 'master':
branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'sdnc-northbound-settings'
java-version: openjdk11
mvn-version: 'mvn36'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index f4be0c6..4775d7d 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,8 +26,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- 'istanbul':
branch: 'istanbul'
java-version: openjdk11
@@ -69,6 +67,8 @@
stream:
- 'master':
branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'sdnc-oam-settings'
java-version: openjdk11
mvn-version: 'mvn36'