X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fpackaging%2Fpackaging.yaml;h=664380505825896c1537d22a25cde0bbcc647ff4;hb=580538afd2795b61a826ccd08195628c729d63cb;hp=ec2200683212139e568b9b8f657df5cb18d3fb0e;hpb=5a2c1a1d8fd167ac3e96fdc5f13a44edd59536a9;p=releng%2Fbuilder.git diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index ec2200683..664380505 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -12,7 +12,9 @@ - 'packaging-test-rpm-master' - 'packaging-test-rpm-upgrade-master' - 'packaging-test-deb-master' - - gerrit-tox-verify + - gerrit-tox-verify: + branch: master + stream: master project: 'integration/packaging' @@ -30,7 +32,7 @@ - job-template: name: 'packaging-build-rpm-{stream}' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -81,6 +83,18 @@ builders: - shell: !include-raw: build-rpm.sh - shell: !include-raw: test-rpm-deps.sh + - inject: + properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm' + - shell: !include-raw: install-rpm.sh + - shell: !include-raw: start-odl.sh + - shell: | + # Install expect to interact with Karaf shell + sudo yum install -y expect + # Install nmap to check status of ODL's SSH port + sudo yum install -y nmap + - shell: !include-raw: test-karaf.expect + - shell: !include-raw: stop-odl.sh + - shell: !include-raw: uninstall-rpm.sh - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' @@ -97,7 +111,7 @@ - job-template: name: 'packaging-build-rpm-snap-{stream}' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -144,6 +158,7 @@ - inject: properties-content: 'STREAM={stream}' - shell: !include-raw: build-rpm-snap.sh + - shell: !include-raw: test-rpm-deps.sh - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' @@ -163,7 +178,7 @@ - job-template: name: 'packaging-verify-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -230,7 +245,7 @@ - job-template: name: 'packaging-verify-full-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -261,9 +276,10 @@ - shell: !include-raw: build-rpm.sh # Test Carbon multipatch zip (no parallel tarball available) + # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20171128.221258-1.zip' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180115.181738-1.zip' - shell: !include-raw: build-rpm.sh # Test latest Carbon snapshot @@ -284,9 +300,10 @@ - shell: !include-raw: build-rpm.sh # Test Nitrogen multipatch zip (no parallel tarball available) + # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20171128.223150-2.zip' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180115.183312-2.zip' - shell: !include-raw: build-rpm.sh # Test latest Nitrogen snapshot @@ -295,15 +312,17 @@ - shell: !include-raw: build-rpm-snap.sh # Test Oxygen pre-release autorelease tarball + # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz' - shell: !include-raw: build-rpm.sh # Test Oxygen multipatch zip (no parallel tarball available) + # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180111.030942-90.zip' - shell: !include-raw: build-rpm.sh # Test latest Oxygen snapshot @@ -332,7 +351,7 @@ - job-template: name: 'packaging-test-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g parameters: - opendaylight-infra-parameters: @@ -344,7 +363,7 @@ - string: name: URL # yamllint disable-line rule:line-length - default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-testing.repo' + default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo' description: 'Link to .repo or .rpm file' scm: @@ -367,6 +386,7 @@ sudo yum install -y nmap - shell: !include-raw: test-karaf.expect - shell: !include-raw: stop-odl.sh + - shell: !include-raw: uninstall-rpm.sh publishers: # TODO: Remove the archive publisher @@ -383,7 +403,7 @@ - job-template: name: 'packaging-test-rpm-upgrade-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g parameters: - opendaylight-infra-parameters: @@ -395,12 +415,12 @@ - string: name: URL # yamllint disable-line rule:line-length - default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-6-release.repo' + default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-release.repo' description: 'Link to .repo or .rpm file' - string: name: UPGRADE_URL # yamllint disable-line rule:line-length - default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-6-testing.repo' + default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-devel.repo' description: 'Link to .repo or .rpm file' scm: @@ -427,6 +447,7 @@ - shell: !include-raw: start-odl.sh - shell: !include-raw: test-karaf.expect - shell: !include-raw: stop-odl.sh + - shell: !include-raw: uninstall-rpm.sh publishers: - lf-infra-publish @@ -435,7 +456,7 @@ - job-template: name: 'packaging-test-deb-master' - node: ubuntu1604-mininet-ovs-25-2c-4g + node: ubuntu1604-mininet-ovs-25-1c-4g parameters: - opendaylight-infra-parameters: @@ -477,7 +498,7 @@ - job-template: name: 'packaging-build-deb-{stream}' - node: ubuntu1604-mininet-ovs-25-2c-4g + node: ubuntu1604-mininet-ovs-25-1c-4g project-type: freestyle