summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2022-01-24 18:04:45 +0000
committerGerrit Code Review <gerrit@onap.org>2022-01-24 18:04:45 +0000
commite1677ff1827e8260a31d85db9e36e68de29de96f (patch)
tree7110ec6f633cbc59886f98f0b2f4a207876de218
parent73681ac17675a8d94a7f10a78f26f5c10a88552d (diff)
parent5612f9378b8b41a1cd15e2f3e80593a8c1a8103f (diff)
Merge "Adding istanbul branch to CLM jobs"
-rw-r--r--jjb/sdc/sdc-sdc-be-common.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-helm-validator.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml6
-rw-r--r--jjb/sdc/sdc.yaml6
6 files changed, 30 insertions, 6 deletions
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