diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-chameleon.yaml | 13 | ||||
| -rw-r--r-- | jjb/aai/aai-champ.yaml | 12 | ||||
| -rw-r--r-- | jjb/aai/aai-rest-client.yaml | 5 | ||||
| -rw-r--r-- | jjb/aai/aai-router-core-service.yaml | 5 | ||||
| -rw-r--r-- | jjb/policy/policy-csit.yaml | 16 | ||||
| -rw-r--r-- | jjb/policy/policy-distribution.yaml | 31 | ||||
| -rw-r--r-- | jjb/policy/policy-docker-base-common.yaml | 25 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 33 | ||||
| -rw-r--r-- | jjb/policy/policy-engine.yaml | 32 | ||||
| -rw-r--r-- | jjb/policy/policy-parent.yaml | 2 |
10 files changed, 25 insertions, 149 deletions
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index a0bd8f3be..7ea108c83 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -11,11 +11,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'clean package dockerfile:build dockerfile:push' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'aai/chameleon' stream: - 'dublin': diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index e583e85d5..5b4449e5c 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'champ-service/pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-f champ-service/pom.xml docker:build -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/champ' stream: - 'master': diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 3136efedb..1526dd31c 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/rest-client' stream: - 'dublin': diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 2816f3f9e..a76033d70 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -11,7 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/router-core' stream: - 'dublin': diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index fe89f30f3..3e2aa14f5 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -7,8 +7,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'health' trigger_jobs: @@ -27,8 +25,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'apex-pdp' trigger_jobs: @@ -44,8 +40,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'distribution' trigger_jobs: @@ -61,8 +55,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'api' trigger_jobs: @@ -78,8 +70,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'xacml-pdp' trigger_jobs: @@ -95,8 +85,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'pap' trigger_jobs: @@ -112,8 +100,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'drools-pdp' trigger_jobs: @@ -129,8 +115,6 @@ stream: - 'master': branch: master - - 'dublin': - branch: dublin functionality: - 'drools-applications' trigger_jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index fc8b26ef2..c6950d274 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.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 @@ -35,31 +29,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-distribution-dublin - project-name: 'policy-distribution-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/distribution' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-distribution-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-distribution-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 0e77931df..1a4d1ff40 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -25,31 +25,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: policy-docker-base-common-dublin - project-name: 'policy-docker-dublin' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - 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: '-P docker' - disabled: false - build-node: ubuntu1604-docker-8c-8g - project: 'policy/docker' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-docker-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: name: policy-docker-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 9c50b9b91..478f28133 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.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 @@ -34,34 +29,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: policy-drools-applications-dublin - project-name: 'policy-drools-applications-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: 'drools-apps-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: 'drools-apps-docker-release.sh' - disabled: false - build-node: ubuntu1604-docker-8c-8g - - project: 'policy/drools-applications' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-drools-applications-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: name: policy-drools-applications-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index ab7b8aadd..1506dc57e 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.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-docker-8c-8g @@ -34,33 +29,6 @@ build-node: 'ubuntu1604-docker-8c-8g' - project: - name: policy-engine-dublin - project-name: 'policy-engine-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/engine' - stream: - - 'dublin': - branch: 'dublin' - mvn-settings: 'policy-engine-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: name: policy-engine-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 116846a75..ff0306719 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.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/parent' stream: |