diff options
Diffstat (limited to 'jjb/sdnc')
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oom.yaml | 41 |
4 files changed, 6 insertions, 49 deletions
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 |