Build deb using refactored logic

This commit updates build deb job for the refactored logic.

Change-Id: I879db3533047eabe67fc39d864a3152292af1975
Signed-off-by: Alok Anand <alok4nand@gmail.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/jjb/packaging/build-deb.sh b/jjb/packaging/build-deb.sh
index 0602669128240ffc810b865283aa3be6de5b2643..0c402f7fe6731cc0ce7902beaeb9b2c294d6cc6b 100644 (file)
--- a/jjb/packaging/build-deb.sh
+++ b/jjb/packaging/build-deb.sh
@@ -6,17 +6,16 @@
 #   -o pipefail: Fail on errors in scripts this calls, give stacktrace
 set -ex -o pipefail
 
+# Install required packages
+virtualenv deb_build
+# shellcheck disable=SC1091
+source deb_build/bin/activate
+PYTHON="deb_build/bin/python"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
+
 # Build release specified by build params
-"$WORKSPACE/packaging/deb/build.py" --major "$VERSION_MAJOR" \
-                                  --minor "$VERSION_MINOR" \
-                                  --patch "$VERSION_PATCH" \
-                                  --deb "$PKG_VERSION" \
-                                  --sysd_commit "$SYSD_COMMIT" \
-                                  --codename "$CODENAME" \
-                                  --java_version "$JAVA_VERSION" \
-                                  --download_url "$DOWNLOAD_URL" \
-                                  --changelog_date "$CHANGELOG_DATE" \
-                                  --changelog_time "$CHANGELOG_TIME" \
+"$WORKSPACE/packaging/packages/build.py" --deb --download_url "$DOWNLOAD_URL" \
                                   --changelog_name "$CHANGELOG_NAME" \
                                   --changelog_email "$CHANGELOG_EMAIL"
 
@@ -25,4 +24,4 @@ UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
 # Note: no source packages are available, since the debs are not built
 # from the actual source
-mv "$WORKSPACE/packaging/deb/opendaylight/"*.deb "$_"
+mv "$WORKSPACE/packaging/packages/deb/opendaylight/"*.deb "$_"

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 5f4d1a0e8f13bee02fa8305dcdd2b0eedce37e57..533c1d9995a91be5d2b6de108963144adb7227d8 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -329,51 +329,11 @@
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
           staging-profile-id: ''
-      - string:
-          name: VERSION_MAJOR
-          default: '5'
-          description: 'OpenDaylight major (element) version number to build'
-      - string:
-          name: VERSION_MINOR
-          default: '3'
-          description: 'OpenDaylight minor (SR) version number to build'
-      - string:
-          name: VERSION_PATCH
-          default: '0'
-          description: 'OpenDaylight patch version to build'
-      - string:
-          name: PKG_VERSION
-          default: '1'
-          description: 'Deb version for the given ODL major.minor.patch'
-      - string:
-          name: SYSD_COMMIT
-          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
-          description: 'Version of ODL systemd unitfile to download and package in ODL .deb'
-      - string:
-          name: CODENAME
-          default: 'Boron-SR3'
-          description: 'Elemental codename for the ODL release, including SR if applicable'
       - 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.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into .deb'
-      - string:
-          name: JAVA_VERSION
-          default: '8'
-          description: Java dependency for the ODL release
-      - string:
-          name: JAVA_HOME
-          default: '/usr/lib/jvm/java-8-openjdk-amd64/'
-          description: Set JAVA_HOME to openjdk8
-      - string:
-          name: CHANGELOG_DATE
-          default: 'Mon, 1 Aug 2016'
-          description: 'Date this .deb was defined'
-      - string:
-          name: CHANGELOG_TIME
-          default: '17:48:42 +0530'
-          description: 'Time this .deb was defined'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'