diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-06-06 18:35:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-06 18:35:27 +0000 |
| commit | c0bf3168835f8e6aa70d5dffd00877b4d0bf0420 (patch) | |
| tree | 02d57e7a41dd846f9563c8d0c7381b09edbe1af0 | |
| parent | 758c7e67a3180110a90a2af4be90332aadfc42e3 (diff) | |
| parent | dc6d9e530b1a6a3d3400972bf4f2c141692d1517 (diff) | |
Merge "Change build node to docker"
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 20 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 20 |
2 files changed, 16 insertions, 24 deletions
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 66bbb63fe..a22d85082 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -4,19 +4,15 @@ project-name: 'policy-drools-applications' 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': + - '{project-name}-{stream}-merge-java': 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' + 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 - build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-applications' stream: @@ -25,7 +21,7 @@ mvn-settings: 'policy-drools-applications-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: ubuntu1604-docker-8c-8g - project: name: policy-drools-applications-dublin diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 0bb33b4b6..8e18ba557 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -4,19 +4,15 @@ project-name: 'policy-drools-pdp' 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': + - '{project-name}-{stream}-merge-java': 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' + 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 - build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-pdp' stream: - 'master': @@ -24,7 +20,7 @@ mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: ubuntu1604-docker-8c-8g - project: name: policy-drools-pdp-dublin |