summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml5
-rw-r--r--jjb/multicloud/multicloud-framework-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-k8s.yaml4
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml2
4 files changed, 0 insertions, 13 deletions
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 465ac219a..56f8da137 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -7,9 +7,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'guilin':
- branch: 'guilin'
- java-version: openjdk11
mvn-settings: 'multicloud-framework-settings'
subproject:
- 'multivimbroker':
@@ -122,8 +119,6 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
java-version: openjdk11
mvn-params: '-f artifactbroker/pom.xml'
mvn-settings: 'multicloud-framework-settings'
diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index 113bce7e9..d81081a1d 100644
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -6,8 +6,6 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
mvn-settings: 'multicloud-framework-settings'
build-node: 'ubuntu1804-builder-4c-4g'
subproject:
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 428535a0f..0081b4ab6 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -27,10 +27,6 @@
stream:
- 'master':
branch: 'master'
- - 'honolulu':
- branch: 'honolulu'
- #KUD fixes are not backported to maintenance branches
- disable-kud: true
mvn-settings: 'multicloud-k8s-settings'
disable-kud: false
files: '**'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index b982bec88..e13705c49 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -12,8 +12,6 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
mvn-settings: 'multicloud-openstack-settings'
subproject:
- 'pike':