From: Pamela Dragosh Date: Wed, 31 Oct 2018 17:47:05 +0000 (-0400) Subject: Add policy casablanca jobs X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0b698bed363786c3ffe0a1edce15956ae657f24c;p=ci-management.git Add policy casablanca jobs After branching on Friday, need to enable the CI/CD jobs for Casablanca branch. * Disable release on master from running * Add CSIT for casablanca Once Casablanca is officially released we will remove those jobs. Issue-ID: POLICY-1234 Change-Id: I296d6b93cb85faf72a0748e7331e5d8fdea2cdc2 Signed-off-by: Pamela Dragosh --- diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 788f0e7d1..77572e3c6 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true project: 'policy/apex-pdp' stream: @@ -26,6 +26,33 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-apex-pdp-casablanca + project-name: 'policy-apex-pdp-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-release.sh' + disabled: false + + project: 'policy/apex-pdp' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-apex-pdp-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-apex-pdp-sonar jobs: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 6613576dd..75175e6cf 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/common' stream: @@ -17,6 +17,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-common-casablanca + project-name: 'policy-common-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily': + disabled: false + + project: 'policy/common' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-common-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-common-sonar jobs: diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 321d3ad1b..90ee700cb 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -4,7 +4,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' - stream: 'master' + stream: + - 'master': + branch: master + - 'casablanca': + branch: casablanca functionality: - 'health' trigger_jobs: @@ -20,7 +24,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' - stream: 'master' + stream: + - 'master': + branch: master + - 'casablanca': + branch: casablanca functionality: - 'apex-pdp' trigger_jobs: @@ -34,7 +42,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' - stream: 'master' + stream: + - 'master': + branch: master + - 'casablanca': + branch: casablanca functionality: - 'distribution' trigger_jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 53fc51083..e51909896 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -12,7 +12,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' @@ -24,6 +24,31 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-distribution-casablanca + project-name: 'policy-distribution-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: false + build-node: ubuntu1604-docker-8c-8g + + project: 'policy/distribution' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-distribution-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-distribution-sonar jobs: diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 31f9ba9e1..c693a4e77 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/drools-applications' stream: @@ -17,6 +17,24 @@ archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' +- project: + name: policy-drools-applications-casablanca + project-name: 'policy-drools-applications-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily': + disabled: false + + project: 'policy/drools-applications' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-drools-applications-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' + - project: name: policy-drools-applications-sonar jobs: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 717eedc8f..7b8be216d 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true project: 'policy/drools-pdp' stream: @@ -26,6 +26,33 @@ archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' +- project: + name: policy-drools-pdp-casablanca + project-name: 'policy-drools-pdp-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-release.sh' + disabled: false + + project: 'policy/drools-pdp' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-drools-pdp-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' + - project: name: policy-drools-pdp-sonar jobs: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e4f81f851..d31267567 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: false + disabled: true project: 'policy/engine' stream: @@ -26,6 +26,33 @@ archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' +- project: + name: policy-engine-casablanca + project-name: 'policy-engine-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'include-raw-docker-release.sh' + disabled: false + + project: 'policy/engine' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-engine-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' + - project: name: policy-engine-sonar jobs: diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 34f357813..f3f1fbf0f 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -5,7 +5,8 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true project: 'policy/parent' stream: @@ -16,6 +17,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: policy-parent-casablanca + project-name: 'policy-parent-casablanca' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily': + disabled: false + + project: 'policy/parent' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'policy-parent-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: policy-parent-clm jobs: