summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2020-11-19 17:42:39 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-19 17:42:39 +0000
commit0e310453deaed015f3263f1f4c5e0fb6e2f24704 (patch)
treed114ccbe1c4e08d32ad985d38d71500b21c17de3
parent6edd441b0062f9e73eb56e23c27f743b3c9416a4 (diff)
parentf9731019d8199e43baa58b2dfddc45603fbbe1a9 (diff)
Merge "[MULTICLOUD] Add guilin to jenkins"
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml3
-rw-r--r--jjb/multicloud/multicloud-framework-python.yaml2
2 files changed, 5 insertions, 0 deletions
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index d28e62eb0..5f0bbfc27 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -7,6 +7,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'guilin':
+ branch: 'guilin'
+ java-version: openjdk11
mvn-settings: 'multicloud-framework-settings'
subproject:
- 'multivimbroker':
diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index d81081a1d..113bce7e9 100644
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -6,6 +6,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'multicloud-framework-settings'
build-node: 'ubuntu1804-builder-4c-4g'
subproject: