Update Jenkins jobs to build rpms using URL parsing

Update params of build-rpm and build-rpm-snap jobs to make use of
URL parsing instead of version parsing.

Change-Id: Idf95897157e589ef8afe90e6a62554cb8c193718
Signed-off-by: Alok Anand <alok4nand@gmail.com>

diff --git a/jjb/packaging/include-raw-build-rpm-snap.sh b/jjb/packaging/include-raw-build-rpm-snap.sh
index 45c44d984de7cd72c07a70a7654acaf1c0a90b56..0a2a6ddf69bf03cb6479f5267b4e5065133f3ea5 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm-snap.sh
+++ b/jjb/packaging/include-raw-build-rpm-snap.sh
@@ -16,8 +16,6 @@ pip install -r $WORKSPACE/packaging/rpm/requirements.txt
 $WORKSPACE/packaging/rpm/build.py --build-latest-snap \
                                   --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \
-                                  --patch "$VERSION_PATCH" \
-                                  --rpm "$RPM_RELEASE" \
                                   --sysd_commit "$SYSD_COMMIT" \
                                   --changelog_name "$CHANGELOG_NAME" \
                                   --changelog_email "$CHANGELOG_EMAIL"

diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh
index 95a4497950383b28a3f65b67a57bcdb7f3b5b68f..a0582e33f469c54957a17649648089bfa6883cbe 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm.sh
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -13,13 +13,8 @@ pip install --upgrade pip
 pip install -r $WORKSPACE/packaging/rpm/requirements.txt
 
 # Build release specified by build params
-$WORKSPACE/packaging/rpm/build.py --major "$VERSION_MAJOR" \
-                                  --minor "$VERSION_MINOR" \
-                                  --patch "$VERSION_PATCH" \
-                                  --rpm "$RPM_RELEASE" \
+$WORKSPACE/packaging/rpm/build.py --download_url "$DOWNLOAD_URL" \
                                   --sysd_commit "$SYSD_COMMIT" \
-                                  --codename "$CODENAME" \
-                                  --download_url "$DOWNLOAD_URL" \
                                   --changelog_date "$CHANGELOG_DATE" \
                                   --changelog_name "$CHANGELOG_NAME" \
                                   --changelog_email "$CHANGELOG_EMAIL"

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index ca6a62fe2542ac64a2863aa961ca7c69a1ae7bc1..0b8dd1bd7cb65cf9a27deb50eae8f0eb75aaa0fc 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -33,33 +33,13 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - string:
-            name: VERSION_MAJOR
-            default: '5'
-            description: 'OpenDaylight major (element) version number to build'
-        - string:
-            name: VERSION_MINOR
-            default: '0'
-            description: 'OpenDaylight minor (SR) version number to build'
-        - string:
-            name: VERSION_PATCH
-            default: '0'
-            description: 'OpenDaylight patch version to build'
-        - string:
-            name: RPM_RELEASE
-            default: '1'
-            description: 'RPM version for the given ODL major.minor.patch'
+           name: DOWNLOAD_URL
+           default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz'
+           description: 'URL to ODL tarball artifact to repackage into RPM'
         - string:
             name: SYSD_COMMIT
             default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
             description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
-        - string:
-            name: CODENAME
-            default: 'Boron'
-            description: 'Elemental codename for the ODL release, including SR if applicable'
-        - string:
-            name: DOWNLOAD_URL
-            default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz'
-            description: 'URL to ODL tarball artifact to repackage into RPM'
         - string:
             name: CHANGELOG_DATE
             default: 'Sun Aug 25 1991'
@@ -115,14 +95,6 @@
             name: VERSION_MINOR
             default: '2'
             description: 'OpenDaylight minor (SR) version number to build'
-        - string:
-            name: VERSION_PATCH
-            default: '0'
-            description: 'OpenDaylight patch version to build'
-        - string:
-            name: RPM_RELEASE
-            default: '0.1.20161212snap531'
-            description: 'RPM version for the given ODL major.minor.patch'
         - string:
             name: SYSD_COMMIT
             default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'