summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ccsdk/apps.yaml8
-rw-r--r--jjb/ccsdk/cds.yaml6
-rw-r--r--jjb/ccsdk/distribution.yaml10
-rw-r--r--jjb/ccsdk/features.yaml8
-rw-r--r--jjb/ccsdk/parent.yaml8
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml8
-rw-r--r--jjb/ccsdk/sli-core.yaml8
-rw-r--r--jjb/ccsdk/sli-northbound.yaml8
-rw-r--r--jjb/ccsdk/sli-plugins.yaml8
-rw-r--r--jjb/sdnc/sdnc-apps.yaml4
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml4
-rw-r--r--jjb/sdnc/sdnc-oam.yaml6
-rw-r--r--jjb/sdnc/sdnc-oom.yaml41
13 files changed, 42 insertions, 85 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index cd7cb95f0..088325835 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -29,8 +29,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
@@ -75,8 +75,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index f466a168b..54dbe98ba 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -29,6 +29,8 @@
branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
@@ -73,8 +75,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 5e7fe59fd..a64443527 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -24,10 +24,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
@@ -67,8 +65,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 97e0f6b27..eb9e8307d 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
@@ -64,8 +64,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 3fed58c9f..24cf739ef 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -19,8 +19,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
@@ -42,8 +42,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index fbb72b2b2..bd553e112 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
@@ -63,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index da41efd2e..658a92c3b 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
@@ -63,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index d316ba992..a66c774ed 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
@@ -63,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 4e71c49b5..4433bb374 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
@@ -63,8 +63,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 0ef436303..d3cc5fe01 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -30,8 +30,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version : "mvn36"
mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index a35908a8a..95b1f9098 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -17,8 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: "mvn36"
mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index fb8b054d5..e0cc01394 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -26,10 +26,8 @@
stream:
- 'master':
branch: 'master'
- - 'elalto':
- branch: 'elalto'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
java-version: openjdk11
mvn-version: "mvn36"
mvn-settings: 'sdnc-oam-settings'
diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
deleted file mode 100644
index ae86ef5bf..000000000
--- a/jjb/sdnc/sdnc-oom.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
- name: sdnc-oom
- helm-module: 'sdnc'
- project-name: 'sdnc-oom'
- project: 'sdnc/oom'
- jobs:
- - '{project-name}-{stream}-verify-external-helm'
- - '{project-name}-{stream}-merge-external-helm':
- build_script: '{oom_build_script}'
- post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
- files: '**'
- stream:
- - 'master':
- branch: 'master'
-
- mvn-settings: 'sdnc-oom-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-helm-2c-1g
- pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
- oom_build_script: |
- #!/bin/bash
- set -e -o pipefail
- cd kubernetes/
- make all
- build_script: |
- #!/bin/bash
- cd kubernetes/
- make common
- make {helm-module}
- oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-
-- project:
- name: sdnc-oom-info
- project-name: sdnc-oom
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: sdnc/oom
- branch: master