From 0f7e76dd4c31f30c3bdf4988abb6f921babf79ce Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 14 May 2021 14:08:18 -0400 Subject: [PATCH] Remove frankfurt jobs Now that Honolulu has been released, frankfurt jobs can be removed. Issue-ID: POLICY-3307 Change-Id: Iae2ab862beefea528f3929ca665dd62ce9e4267c Signed-off-by: Jim Hahn --- jjb/policy/policy-apex-pdp.yaml | 2 -- jjb/policy/policy-api.yaml | 2 -- jjb/policy/policy-common.yaml | 2 -- jjb/policy/policy-csit.yaml | 14 -------- jjb/policy/policy-distribution.yaml | 2 -- jjb/policy/policy-docker-base-common.yaml | 57 ------------------------------ jjb/policy/policy-drools-applications.yaml | 2 -- jjb/policy/policy-drools-pdp.yaml | 2 -- jjb/policy/policy-models.yaml | 2 -- jjb/policy/policy-pap.yaml | 2 -- jjb/policy/policy-parent.yaml | 2 -- jjb/policy/policy-xacml-pdp.yaml | 2 -- 12 files changed, 91 deletions(-) diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 406962beb..4b570604a 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -31,8 +31,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 3ef1b6c76..3746aed4a 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 8625cf406..1ca5db6a4 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 3fcee1c2c..205a731cf 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -132,8 +132,6 @@ project-name: 'policy' java-version: openjdk11 stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -151,8 +149,6 @@ java-version: openjdk11 recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -170,8 +166,6 @@ java-version: openjdk11 recipients: 'ram.krishna.verma@est.tech' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -189,8 +183,6 @@ java-version: openjdk11 recipients: 'ah999m@att.com' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -208,8 +200,6 @@ java-version: openjdk11 recipients: 'jrh3@att.com ram.krishna.verma@est.tech' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -226,8 +216,6 @@ project-name: 'policy' java-version: openjdk11 stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -244,8 +232,6 @@ project-name: 'policy' java-version: openjdk11 stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 40562db89..f614feba3 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 3d9be5dbe..cf8b967e2 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -31,63 +31,6 @@ archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -- project: - name: policy-docker-base-common-frankfurt - project-name: 'policy-docker' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-docker-amd64' - 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: ubuntu1804-docker-8c-8g - pattern: 'do_not_match_any_file' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-docker-arm64' - 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: ubuntu1804-docker-arm64-4c-2g - pattern: 'do_not_match_any_file' - - '{project-name}-multiarch-{stream}-merge-java' - - gerrit-maven-docker-stage: - project-name: 'policy-docker-arm64' - build-node: ubuntu1804-docker-arm64-4c-2g - 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' - container-staging-registry: 'docker.io' - cron: '' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'do_not_match_any_file' - - gerrit-maven-docker-stage: - project-name: 'policy-docker-amd64' - 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' - container-staging-registry: 'docker.io' - cron: '' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'do_not_match_any_file' - - '{project-name}-docker-manifest-{stream}': - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-multiarch-docker-stage-{stream}' -# - '{project-name}-gerrit-release-jobs': -# build-node: centos7-docker-8c-8g - - project: 'policy/docker' - stream: - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'policy-docker-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - project: name: policy-docker-clm jobs: diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 848ca6d2b..81bc61a36 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index e73edca33..c27aab8fc 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 6c52903a5..c2d5b485f 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 31a2287ad..a7a7ce58a 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index a2ad31ec0..2ec9cb072 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 4d59908f8..d8abd90ab 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - 'guilin': branch: 'guilin' - 'honolulu': -- 2.16.6