From 02351d480493195f6400c1f47fb9dcf211bb0f98 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Mon, 1 Jul 2019 14:38:30 -0400 Subject: [PATCH] Clean up policy dublin and release jobs No longer releasing dublin artifacts and cleaning out the old release jobs no longer needed due to global-jjb migration. Issue-ID: POLICY-1737 Change-Id: I914ff64b12845d8fad19cf97620dfd346c3fcc32 Signed-off-by: Pamela Dragosh --- jjb/policy/policy-apex-pdp.yaml | 32 -------------------------------- jjb/policy/policy-api.yaml | 28 ---------------------------- jjb/policy/policy-common.yaml | 20 -------------------- jjb/policy/policy-drools-pdp.yaml | 32 -------------------------------- jjb/policy/policy-models.yaml | 20 -------------------- jjb/policy/policy-pap.yaml | 31 ------------------------------- jjb/policy/policy-parent.yaml | 18 ------------------ jjb/policy/policy-xacml-pdp.yaml | 31 ------------------------------- 8 files changed, 212 deletions(-) diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 10ef69da2..d94bf4b7f 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -14,11 +14,6 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: true - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -39,33 +34,6 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g -- project: - name: policy-apex-pdp-dublin - project-name: 'policy-apex-pdp-dublin' - 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 - build-node: ubuntu1604-docker-8c-8g - project: 'policy/apex-pdp' - stream: - - 'dublin': - branch: 'dublin' - 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-api.yaml b/jjb/policy/policy-api.yaml index 8038cb3e0..24af5a950 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -8,12 +8,6 @@ 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: true - build-node: ubuntu1604-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -34,28 +28,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: policy-api-dublin - project-name: 'policy-api-dublin' - 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/api' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-api-settings' - - project: name: policy-api-sonar jobs: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 2e99c97e7..2085e1a89 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -9,8 +9,6 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-{stream}-release-version-java-daily': - disabled: true project: 'policy/common' stream: @@ -21,24 +19,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: policy-common-dublin - project-name: 'policy-common-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: false - - project: 'policy/common' - stream: - - 'dublin': - branch: 'dublin' - 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-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index b0ded4a35..3c8a38089 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -8,11 +8,6 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker' - disabled: true - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -33,33 +28,6 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g -- project: - name: policy-drools-pdp-dublin - project-name: 'policy-drools-pdp-dublin' - 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 - build-node: ubuntu1604-docker-8c-8g - project: 'policy/drools-pdp' - stream: - - 'dublin': - branch: 'dublin' - 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-models.yaml b/jjb/policy/policy-models.yaml index b9f6c78cd..b807d2d61 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -5,8 +5,6 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: true - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -21,24 +19,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: policy-models-dublin - project-name: 'policy-models-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: false - - project: 'policy/models' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-models-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - project: name: policy-models-sonar jobs: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 8a6666b45..73727b0c8 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -8,12 +8,6 @@ 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: true - build-node: ubuntu1604-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -34,31 +28,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: policy-pap-dublin - project-name: 'policy-pap-dublin' - 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/pap' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-pap-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - project: name: policy-pap-sonar jobs: diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 7722b81b2..116846a75 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -21,24 +21,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: policy-parent-dublin - project-name: 'policy-parent-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': - disabled: false - - project: 'policy/parent' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-parent-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - project: name: policy-parent-clm jobs: diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index e50db0764..feb9afe3a 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -8,12 +8,6 @@ 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: true - build-node: ubuntu1604-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g @@ -34,31 +28,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: policy-xacml-pdp-dublin - project-name: 'policy-xacml-pdp-dublin' - 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/xacml-pdp' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-xacml-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - project: name: policy-xacml-pdp-sonar jobs: -- 2.16.6