X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fpackaging.yaml;h=a465ac8c5d7310d5457af728cdedff9278411090;hb=95d62ba8065ca3281fb2b6265411f6412fc67594;hp=9f4093fc0658a2c7cd2c8073b2568b5dcc841c17;hpb=4e71a30cee212cedc1f913793e4eceebc64215fd;p=releng%2Fbuilder.git diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 9f4093fc0..a465ac8c5 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 @@ -57,7 +59,7 @@ - string: name: DOWNLOAD_URL # yamllint disable-line rule:line-length - default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz' + default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz' description: 'URL to ODL tarball artifact to repackage into RPM' - string: name: CHANGELOG_NAME @@ -79,7 +81,8 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: build-rpm.sh + - shell: !include-raw-escape: build-rpm.sh + - install-test-uninstall-rpm - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' @@ -96,7 +99,7 @@ - job-template: name: 'packaging-build-rpm-snap-{stream}' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -140,7 +143,10 @@ build-timeout: '{build-timeout}' builders: + - inject: + properties-content: 'STREAM={stream}' - shell: !include-raw: build-rpm-snap.sh + - install-test-uninstall-rpm - lf-infra-deploy-maven-file: global-settings-file: 'global-settings' settings-file: 'packaging-settings' @@ -160,7 +166,7 @@ - job-template: name: 'packaging-verify-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -183,27 +189,37 @@ build-timeout: '{build-timeout}' builders: - # TODO: Install/test each RPM? Will require builder script changes. # Test Nitrogen tarball - inject: # yamllint disable-line rule:line-length properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz' - - shell: !include-raw: build-rpm.sh + - shell: !include-raw-escape: build-rpm.sh + - install-test-uninstall-rpm - # Test Nitrogen multipatch zip (no parallel tarball available) + # Test Oxygen pre-release autorelease tarball + # FIXME: There aren't any available Oxygen autorelease builds, add one once possible + # - 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-escape: build-rpm.sh + # - install-test-uninstall-rpm + + # Test Oxygen multipatch zip (no parallel tarball available) - 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.1-SNAPSHOT/karaf-0.7.1-20171009.081353-13.zip' - - shell: !include-raw: build-rpm.sh + 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-20180126.083749-120.zip' + - shell: !include-raw-escape: build-rpm.sh + - install-test-uninstall-rpm - # Test latest Nitrogen snapshot + # Test latest Oxygen snapshot - inject: - properties-content: 'STREAM=nitrogen' + properties-content: 'STREAM=oxygen' - shell: !include-raw: build-rpm-snap.sh + - install-test-uninstall-rpm triggers: - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' projects: - project-compare-type: ANT project-pattern: '{project}' @@ -221,7 +237,7 @@ - job-template: name: 'packaging-verify-full-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g project-type: freestyle @@ -244,63 +260,83 @@ build-timeout: '{build-timeout}' builders: - # TODO: Install/test each RPM. Will require builder script changes. - # Test Carbon SR1 tarball + # Test Carbon SR2 tarball - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.1-Carbon/distribution-karaf-0.6.1-Carbon.tar.gz' - - shell: !include-raw: build-rpm.sh + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz' + - shell: !include-raw-escape: build-rpm.sh + - install-test-uninstall-rpm # 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.2-SNAPSHOT/distribution-karaf-0.6.2-20171009.100453-60.zip' - - shell: !include-raw: build-rpm.sh + 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-escape: build-rpm.sh + - install-test-uninstall-rpm # Test latest Carbon snapshot - inject: properties-content: 'STREAM=carbon' - shell: !include-raw: build-rpm-snap.sh + - install-test-uninstall-rpm # Test Nitrogen tarball - inject: # yamllint disable-line rule:line-length properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz' - - shell: !include-raw: build-rpm.sh + - shell: !include-raw-escape: build-rpm.sh + - install-test-uninstall-rpm + + # Test Nitrogen SR1 tarball + - inject: + # yamllint disable-line rule:line-length + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz' + - shell: !include-raw-escape: build-rpm.sh + - install-test-uninstall-rpm # 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.1-SNAPSHOT/karaf-0.7.1-20171009.081353-13.zip' - - shell: !include-raw: build-rpm.sh + 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-escape: build-rpm.sh + - install-test-uninstall-rpm # Test latest Nitrogen snapshot - inject: properties-content: 'STREAM=nitrogen' - shell: !include-raw: build-rpm-snap.sh + - install-test-uninstall-rpm - # Test Oxygen tarball - # TODO: Change this to an autorelease build once available - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171009.114003-676.tar.gz' - - shell: !include-raw: build-rpm.sh + # Test Oxygen pre-release autorelease tarball + # NB: This will need to be updated as old builds expire + # FIXME: There aren't any available Oxygen autorelease builds, add one once possible + # - 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-escape: build-rpm.sh + # - install-test-uninstall-rpm # Test Oxygen multipatch zip (no parallel tarball available) - - 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-20171004.132827-33.zip' - - shell: !include-raw: build-rpm.sh + # FIXME: Something is wrong with current Oxygen multipatch builds + # 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-20180111.030942-90.zip' + # - shell: !include-raw: build-rpm.sh + # - install-test-uninstall-rpm # Test latest Oxygen snapshot - inject: properties-content: 'STREAM=oxygen' - shell: !include-raw: build-rpm-snap.sh + - install-test-uninstall-rpm triggers: - timed: '@daily' - gerrit: - server-name: '{server-name}' + server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: comment-contains-value: 'verify-rpm-full' @@ -318,7 +354,7 @@ - job-template: name: 'packaging-test-rpm-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g parameters: - opendaylight-infra-parameters: @@ -330,7 +366,7 @@ - string: name: URL # yamllint disable-line rule:line-length - default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-60-release.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: @@ -344,15 +380,16 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: install-rpm.sh + - shell: !include-raw-escape: 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 + sudo yum install -y expect nmap - shell: !include-raw: test-karaf.expect + - shell: !include-raw-escape: test-rest-ok.sh - shell: !include-raw: stop-odl.sh + - shell: !include-raw: uninstall-rpm.sh publishers: # TODO: Remove the archive publisher @@ -369,7 +406,7 @@ - job-template: name: 'packaging-test-rpm-upgrade-master' - node: centos7-java-builder-2c-4g + node: centos7-builder-2c-8g parameters: - opendaylight-infra-parameters: @@ -381,12 +418,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: @@ -400,7 +437,7 @@ build-timeout: '{build-timeout}' builders: - - shell: !include-raw: install-rpm.sh + - shell: !include-raw-escape: install-rpm.sh - shell: !include-raw: start-odl.sh - shell: | # Install expect to interact with Karaf shell @@ -413,6 +450,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 @@ -421,7 +459,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: @@ -463,7 +501,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