diff options
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml | 12 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml | 11 | ||||
-rw-r--r-- | jjb/integration/integration.yaml | 21 | ||||
-rw-r--r-- | jjb/policy/policy-apex-pdp.yaml | 8 | ||||
-rw-r--r-- | jjb/policy/policy-docker-base-common.yaml | 14 | ||||
-rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 8 | ||||
-rw-r--r-- | jjb/policy/policy-engine.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-gui.yaml | 10 | ||||
-rw-r--r-- | jjb/so/so.yaml | 4 |
10 files changed, 61 insertions, 31 deletions
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 685582e51..3f561407a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -50,7 +50,17 @@ stream: all branch: '*' - gerrit-docker-verify - - gerrit-docker-merge + - gerrit-docker-merge: + post_docker_build_script: | + #!/bin/bash + set -uex -o pipefail + DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}} + DNAME={container-snapshot-registry}/{docker-name} + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest + docker push $DNAME:$DOCKER_IMAGE_TAG2 + docker push $DNAME:latest + - gerrit-maven-clm: mvn-params: '-f {src-dir}' stream: master diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index be95546f1..1c2dd5984 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -57,7 +57,16 @@ stream: master branch: 'master' - gerrit-docker-verify - - gerrit-docker-merge + - gerrit-docker-merge: + post_docker_build_script: | + #!/bin/bash + set -uex -o pipefail + DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}} + DNAME={container-snapshot-registry}/{docker-name} + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest + docker push $DNAME:$DOCKER_IMAGE_TAG2 + docker push $DNAME:latest - gerrit-whitesource-scan: build-timeout: 120 submodule-timeout: 30 diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 62a0bed76..ef112ea20 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -49,21 +49,30 @@ golangver: 'golang112' mvn-settings: 'integration-settings' archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g jobs: - - '{project-name}-{stream}-{subproject}-verify-golang': + - '{project-name}-{stream}-{subproject}-verify-golang' + subproject: + - 'test-security-k8s': + path: 'test/security/k8s' + pattern: '{path}/**' + build-node: ubuntu1804-builder-4c-4g script: | #!/bin/bash set -ex # Fail build if any setup step fails cd $WORKSPACE/{path} make test - subproject: - - 'test-security-k8s': - path: 'test/security/k8s' - pattern: '{path}/**' - 'test-security-sslendpoints': path: 'test/security/sslendpoints' pattern: '{path}/**' + build-node: ubuntu1804-docker-8c-8g + script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd $WORKSPACE/{path} + rm -rf $WORKSPACE/{path}/bin + make docker-build + make test + make clean stream: - 'master': branch: 'master' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 1923c765e..42cfd7c6e 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -19,9 +19,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker maven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -35,7 +35,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: policy-apex-pdp-sonar @@ -47,7 +47,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-8c-8g project: 'policy/apex-pdp' project-name: 'policy-apex-pdp' branch: 'master' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 5688d1fd0..61ac6feed 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -8,9 +8,9 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -25,7 +25,7 @@ mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-docker-base-common @@ -37,7 +37,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g pattern: 'do_not_match_any_file' - '{project-name}-{stream}-merge-java': project-name: 'policy-docker-arm64' @@ -60,7 +60,7 @@ pattern: 'do_not_match_any_file' - gerrit-maven-docker-stage: project-name: 'policy-docker-amd64' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' container-public-registry: 'docker.io' @@ -70,7 +70,7 @@ - compare-type: REG_EXP pattern: 'do_not_match_any_file' - '{project-name}-docker-manifest-{stream}': - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-multiarch-docker-stage-{stream}' # - '{project-name}-gerrit-release-jobs': # build-node: centos7-docker-8c-8g @@ -82,7 +82,7 @@ mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-docker-clm diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 7935f3300..32c42574a 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -15,7 +15,7 @@ - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 25b45e0fc..6440e3578 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -13,9 +13,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: policy-drools-pdp-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/drools-pdp' project-name: 'policy-drools-pdp' branch: 'master' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 0ebc274b8..1f6eb30a1 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -15,7 +15,7 @@ - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index fc57249e7..862c04031 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -7,19 +7,21 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + disabled: true - '{project-name}-gerrit-release-jobs': build-node: centos7-builder-4c-4g + disabled: true project: 'policy/gui' stream: @@ -29,7 +31,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-gui-sonar @@ -41,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/gui' project-name: 'policy-gui' branch: 'master' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 323bca47d..6fbdd9871 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -18,7 +18,7 @@ - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -63,7 +63,7 @@ project-name: 'so' branch: 'master' mvn-settings: 'so-settings' - mvn-params: '-Dmaven.test.skip=true' + mvn-params: '-DskipTests' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' coverity-project-name: 'onap-so' coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ' |