summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg2
-rw-r--r--jjb/aaf/aaf-authz.yaml2
-rw-r--r--jjb/appc/appc-cdt.yaml2
-rw-r--r--jjb/appc/appc-deployment.yaml4
-rw-r--r--jjb/appc/appc-master.yaml2
-rw-r--r--jjb/appc/appc-parent.yaml2
6 files changed, 13 insertions, 1 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index e4dc86656..d69e20940 100644
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200506-024530.214
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200506-233718.921
LABELS=ubuntu1804-helm-2c-1g
HARDWARE_ID=v2-highcpu-2
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 341547a9f..5e4dab4ab 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -34,6 +34,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'aaf-authz-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 8a3f8e83b..26764c615 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-cdt-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 4fdbb66eb..edffd6bf8 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
@@ -39,6 +41,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 2c226c743..513126b17 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -26,6 +26,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-settings'
maven-version: "mvn35"
files: '**'
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 2ada1b0b0..c717284e7 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-parent-settings'
maven-version: "mvn35"
build-node: ubuntu1804-builder-4c-4g