diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 5 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-casablanca.yaml | 54 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-starlingx-csit.yaml | 5 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack.yaml | 2 | ||||
| -rw-r--r-- | jjb/music/music-trigger.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 5 |
7 files changed, 65 insertions, 12 deletions
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index dea056ac0..748dfb016 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -1,6 +1,6 @@ --- - project: - name: dcaegen2-services-datafile + name: dcaegen2-services-pm-mapper # job template iterators project-name: 'dcaegen2-services-pm-mapper' stream: @@ -20,6 +20,9 @@ mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean install dockerfile:build dockerfile:push' + script: '/bin/true' - project: name: dcaegen2-services-pm-mapper-sonar diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 2951d351d..70d8c097e 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1336,7 +1336,7 @@ <<: *merge_java_defaults name: '{project-name}-{stream}-sdc-merge-java' - node: 'ubuntu1604-docker-8c-8g' + node: '{build-node}' build-timeout: 120 builders: diff --git a/jjb/multicloud/multicloud-openstack-casablanca.yaml b/jjb/multicloud/multicloud-openstack-casablanca.yaml new file mode 100644 index 000000000..bbe90c551 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-casablanca.yaml @@ -0,0 +1,54 @@ +--- +- project: + name: multicloud-openstack-casablanca + project-name: 'multicloud-openstack-casablanca' + project: 'multicloud/openstack' + stream: + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'multicloud-openstack-settings' + subproject: + - 'newton': + path: 'newton' + pattern: 'newton/**' + pom: 'newton/pom.xml' + - 'newton_share': + path: 'newton' + pattern: 'share/**' + pom: 'newton/pom.xml' + - 'ocata': + path: 'ocata' + pattern: 'ocata/**' + pom: 'ocata/pom.xml' + - 'ocata_share': + path: 'ocata' + pattern: 'share/**' + pom: 'ocata/pom.xml' + - 'pike': + path: 'pike' + pattern: 'pike/**' + pom: 'pike/pom.xml' + - 'pike_share': + path: 'pike' + pattern: 'share/**' + pom: 'pike/pom.xml' + - 'windriver': + path: 'windriver' + pattern: 'windriver/**' + pom: 'windriver/pom.xml' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' + build-node: ubuntu1604-docker-8c-8g + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-memcached-4c-4g' + + diff --git a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml index 364bf01fd..f2dd9999f 100644 --- a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml @@ -2,11 +2,14 @@ - project: name: multicloud-openstack-starlingx-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-starlingx' stream: 'master' functionality: - 'functionality1': - trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: + - 'multicloud-openstack-master-docker-java-version-shell-daily' + - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index df030bc4d..1dbac8366 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -12,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'multicloud-openstack-settings' subproject: - 'newton': diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml index 4a76c5bcb..105dedd25 100644 --- a/jjb/music/music-trigger.yaml +++ b/jjb/music/music-trigger.yaml @@ -11,8 +11,8 @@ - '{project-name}-{stream}-{subproject}-merge-java' project: 'music' stream: - - 'trigger-master': - branch: 'master' + - 'trigger-casablanca': + branch: 'casablanca' mvn-settings: 'music-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 7fe7985ac..cfdaad2f5 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -56,11 +56,6 @@ name: sdc-arm64 project-name: 'sdc-arm64' jobs: - - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1604-docker-arm64-4c-2g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - '{project-name}-{stream}-docker-version-java-daily': build-node: 'ubuntu1604-docker-arm64-4c-2g' docker-pom: 'pom.xml' |