diff options
Diffstat (limited to 'jjb/policy')
-rw-r--r-- | jjb/policy/policy-apex-pdp.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-api.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-common.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-csit.yaml | 21 | ||||
-rw-r--r-- | jjb/policy/policy-distribution.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-docker-base-common.yaml | 57 | ||||
-rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-engine.yaml | 54 | ||||
-rw-r--r-- | jjb/policy/policy-models.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-pap.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-parent.yaml | 2 | ||||
-rw-r--r-- | jjb/policy/policy-xacml-pdp.yaml | 2 |
13 files changed, 7 insertions, 145 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 ebc34a4ae..205a731cf 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -14,6 +14,7 @@ - 'distribution' trigger_jobs: - 'policy-distribution-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-xacml-pdp-project-csit @@ -31,6 +32,7 @@ - 'xacml-pdp' trigger_jobs: - 'policy-xacml-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-drools-applications-project-csit @@ -48,6 +50,7 @@ - 'drools-applications' trigger_jobs: - 'policy-drools-applications-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-drools-pdp-project-csit @@ -65,6 +68,7 @@ - 'drools-pdp' trigger_jobs: - 'policy-drools-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-apex-pdp-project-csit @@ -82,6 +86,7 @@ - 'apex-pdp' trigger_jobs: - 'policy-apex-pdp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-pap-project-csit @@ -99,6 +104,7 @@ - 'pap' trigger_jobs: - 'policy-pap-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-api-project-csit @@ -116,6 +122,7 @@ - 'api' trigger_jobs: - 'policy-api-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' - project: name: policy-api-csit @@ -125,8 +132,6 @@ project-name: 'policy' java-version: openjdk11 stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -144,8 +149,6 @@ java-version: openjdk11 recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -163,8 +166,6 @@ java-version: openjdk11 recipients: 'ram.krishna.verma@est.tech' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -182,8 +183,6 @@ java-version: openjdk11 recipients: 'ah999m@att.com' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -201,8 +200,6 @@ java-version: openjdk11 recipients: 'jrh3@att.com ram.krishna.verma@est.tech' stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -219,8 +216,6 @@ project-name: 'policy' java-version: openjdk11 stream: - - 'frankfurt': - branch: frankfurt - 'guilin': branch: guilin functionality: @@ -237,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 @@ -32,63 +32,6 @@ 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: - gerrit-maven-clm 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-engine.yaml b/jjb/policy/policy-engine.yaml deleted file mode 100644 index b1df14f7a..000000000 --- a/jjb/policy/policy-engine.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- project: - name: policy-engine - project-name: 'policy-engine' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - 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' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'policy/engine' - stream: - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'policy-engine-settings' - java-version: openjdk11 - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - -- project: - name: policy-engine-clm - jobs: - - gerrit-maven-clm: - build-timeout: 40 - nexus-iq-namespace: 'onap-' - project: policy/engine - project-name: 'policy-engine' - branch: 'frankfurt' - mvn-settings: 'policy-engine-settings' - java-version: openjdk11 - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: policy-engine-info - project-name: policy-engine - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: policy/engine - branch: frankfurt 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': |