revert back csit-api for guilin and frankfurt branch

[ci-management.git] / jjb / policy / policy-docker-base-common.yaml

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index d5c9d25..81debd9 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-docker-base-common-elalto
+    name: policy-docker-base-common
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -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'
@@ -20,15 +20,17 @@
 
     project: 'policy/docker'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     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
+    name: policy-docker-base-common-frankfurt
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -37,19 +39,19 @@
           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'
           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-arm64-4c-2g
+          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: ubuntu1604-docker-arm64-4c-2g
+          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'
@@ -60,7 +62,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,19 +72,19 @@
              - 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
 
     project: 'policy/docker'
     stream:
-      - 'master':
-          branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     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