diff options
Diffstat (limited to 'jjb/optf/optf-has.yaml')
| -rw-r--r-- | jjb/optf/optf-has.yaml | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index b94af567d..c657540f1 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -15,10 +15,10 @@ pattern: 'conductor/**' pom: 'pom.xml' jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-verify-python': + build-node: ubuntu1804-builder-4c-4g + - '{project-name}-{stream}-{subproject}-merge-java': + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g @@ -26,48 +26,16 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' docker-pom: 'conductor/pom.xml' - mvn-goals: 'install' mvn-params: '-Dmaven.test.skip=true -P docker' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: - name: optf-has-docker - project-name: 'optf-has' - project: 'optf/has' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'optf-has-settings' - subproject: - - 'conductor': - path: 'conductor' - pattern: 'conductor/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-has-docker-image.sh' - build-node: queue-docker-4c-4g - - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-has-docker-image.sh' - build-node: queue-docker-4c-4g + build-node: 'ubuntu1804-builder-4c-4g' - project: name: optf-has-sonar @@ -79,7 +47,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-docker-8c-8g project: 'optf/has' project-name: 'optf-has' branch: 'master' @@ -94,6 +62,7 @@ nexus-iq-namespace: 'onap-' project: optf/has project-name: 'optf-has' + build-node: ubuntu1804-docker-8c-8g stream: - 'master': branch: 'master' |