diff options
| -rw-r--r-- | jjb/integration/xtesting/integration-xtesting.yaml | 3 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 14 | ||||
| -rw-r--r-- | jjb/oom/oom-image-verify.yaml | 54 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 6 |
5 files changed, 65 insertions, 16 deletions
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 5cbce4e84..1c5f21f76 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -106,6 +106,9 @@ - 'frankfurt': branch: 'frankfurt' files: '' + - 'develop': + branch: 'develop' + files: '' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 4b0803c06..71d57744c 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -12,22 +12,10 @@ #!/bin/bash set -e -o pipefail cd kubernetes/ - if [ "$GERRIT_BRANCH" != "staging" ]; then - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 - fi - fi make all subproject_build_script: | #!/bin/bash cd kubernetes/ - if [ "$GERRIT_BRANCH" != "staging" ]; then - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 - fi - fi make common make {subproject} oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh @@ -99,6 +87,8 @@ files: 'kubernetes/vnfsdk/**' jobs: + - '{project-name}-{stream}-image-verify': + files: '**' - '{project-name}-{stream}-verify-helm': build_script: '{oom_build_script}' files: '**' diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml new file mode 100644 index 000000000..058f4ee4f --- /dev/null +++ b/jjb/oom/oom-image-verify.yaml @@ -0,0 +1,54 @@ +--- +- job-template: + name: '{project-name}-{stream}-image-verify' + concurrent: true + branch: master + submodule-recursive: true + + build_script: '' + git-url: '$GIT_URL/$PROJECT' + post_build_script: '' + pre_build_script: '' + submodule-disable: false + submodule-timeout: 10 + build-timeout: 180 + + project-type: freestyle + node: '{build-node}' + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: '{project}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + triggers: + - gerrit-trigger-helm-patch-submitted: + status-context: '{project}-Helm-Verify' + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - shell: 'cd kubernetes; make check-for-staging-images 2>&1' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 4faecd0d5..c6a9eccde 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -54,12 +54,14 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'guilin': branch: 'guilin' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'sdc-settings' - java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index d3cc5fe01..21a9155af 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" + maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -43,7 +43,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -65,7 +65,7 @@ mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" # #- project: |