From 050cba192c397aaff36eafb52d0d0ffd03fc1f5b Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 20 Jun 2017 17:28:17 +1000 Subject: [PATCH] Upload ODL packaging rpm's to nexus repository - Packaging jobs are modified to upload rpms & srpm onto nexus repositroy. - A separate Nexus repository is created for each '{stream}'. The repos are enabled to generate yum metadata along with scheduled tasks for devel repositories to purge packages from daily builds after 30 days. - Nexus repositories format: Release: opendaylight-{stream}-epel-7-x86_64 Testing/Staging: opendaylight-{stream}-epel-7-x86_64-devel Release: opendaylight-{stream}-ubuntu-1604-x86_64 Testing/Staging: opendaylight-{stream}-ubuntu-1604-x86_64-devel - Modify autorelease jobs to trigger stream specific downstream jobs. Change-Id: I86cca89c1f2b8feb2dd229b04796c623ce0c0990 Signed-off-by: Anil Belur --- jjb/autorelease/autorelease-templates.yaml | 2 +- jjb/packaging/include-raw-build-rpm.sh | 6 ++++ jjb/packaging/packaging.yaml | 36 ++++++++++++++++------ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 95800c190..73466d635 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -133,7 +133,7 @@ - project: 'integration-sanity-test-{integration-test}' condition: FAILED trigger-with-no-params: true - - project: 'packaging-build-rpm-master' + - project: 'packaging-build-rpm-{stream}' condition: UNSTABLE_OR_BETTER predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL property-file: variables.jenkins-trigger diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh index bd63c9555..23c927309 100644 --- a/jjb/packaging/include-raw-build-rpm.sh +++ b/jjb/packaging/include-raw-build-rpm.sh @@ -22,3 +22,9 @@ download_url="${{DOWNLOAD_URL//zip/tar.gz}}" "$WORKSPACE/packaging/rpm/build.py" --download_url "$download_url" \ --changelog_name "$CHANGELOG_NAME" \ --changelog_email "$CHANGELOG_EMAIL" + +# Copy the rpm to be upload +UPLOAD_FILES_PATH="$WORKSPACE/upload_files" +mkdir -p "$UPLOAD_FILES_PATH" +cp "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_" +cp "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_" diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 417c498f8..f387a3946 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -4,18 +4,20 @@ project-name: packaging jobs: - - '{project-name}-verify-tox-{stream}' + - '{project-name}-verify-tox-master' - 'packaging-build-rpm-{stream}' - - 'packaging-build-rpm-snap-{stream}' + - 'packaging-build-rpm-snap-master' - 'packaging-build-deb-{stream}' - - 'packaging-test-rpm-{stream}' - - 'packaging-test-deb-{stream}' + - 'packaging-test-rpm-master' + - 'packaging-test-deb-master' project: 'integration/packaging' stream: - - master: - branch: 'master' + - boron + - carbon + - nitrogen + branch: 'master' - job-template: name: 'packaging-build-rpm-{stream}' @@ -24,6 +26,10 @@ project-type: freestyle + mvn-opts: '' + mvn-params: '' + mvn-version: mvn33 + properties: - opendaylight-infra-properties: build-days-to-keep: 7 @@ -35,6 +41,11 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' + - lf-infra-maven-parameters: + mvn-opts: '{mvn-opts}' + mvn-params: '{mvn-params}' + mvn-version: '{mvn-version}' + staging-profile-id: '' - string: name: DOWNLOAD_URL # yamllint disable-line rule:line-length @@ -61,6 +72,13 @@ builders: - shell: !include-raw: include-raw-build-rpm.sh + - lf-infra-deploy-maven-file: + global-settings-file: 'global-settings' + settings-file: 'packaging-settings' + mvn-version: 'mvn33' + repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel' + group-id: 'org.opendaylight.integration-packaging' + files-dir: '$WORKSPACE/upload_files' publishers: - archive-artifacts: @@ -69,7 +87,7 @@ - job-template: - name: 'packaging-build-rpm-snap-{stream}' + name: 'packaging-build-rpm-snap-master' node: centos7-java-builder-2c-4g @@ -126,7 +144,7 @@ - job-template: - name: 'packaging-test-rpm-{stream}' + name: 'packaging-test-rpm-master' node: centos7-java-builder-2c-4g @@ -164,7 +182,7 @@ - job-template: - name: 'packaging-test-deb-{stream}' + name: 'packaging-test-deb-master' node: ubuntu1604-mininet-ovs-25-2c-4g -- 2.36.6