diff options
| -rw-r--r-- | jjb/ccsdk/apps.yaml | 4 | ||||
| -rw-r--r-- | jjb/ccsdk/ccsdk-oran.yaml | 4 | ||||
| -rw-r--r-- | jjb/ccsdk/cds.yaml | 6 | ||||
| -rw-r--r-- | jjb/ccsdk/distribution.yaml | 4 | ||||
| -rw-r--r-- | jjb/ccsdk/features.yaml | 4 | ||||
| -rw-r--r-- | jjb/ccsdk/parent.yaml | 4 | ||||
| -rw-r--r-- | jjb/ccsdk/sli.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-be-common.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-helm-validator.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-tosca.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 4 |
17 files changed, 40 insertions, 40 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 2b6aff41f..775f85648 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 cf19550b1..5a6150663 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 a24ce0425..f0fd25f67 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 8744061bd..4a24dd29d 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 25f78e73f..ba34b88d6 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 80a3d976f..d3d780c2f 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 c88f63000..34f56cdc7 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 fb3e78840..5d204dd81 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 e20b95452..9e7a5e109 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 5b8780967..247748881 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 5cfdc2f48..c8aa37de2 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 2547e6ba9..41a1bb06f 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 bba93f03e..184f6f063 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 6c843ced4..f7c7d690b 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 cc2150399..4c168822c 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 80c9dfd23..9447158e1 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 f4be0c670..4775d7d63 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' |