Remove SYSD_COMMIT var

This is no longer needed as RPM logic now uses latest Int/Pack repo
commit hash as sysd_commit.

Change-Id: Ia11eb40437b48a9804c88775fe87536965f39345
Signed-off-by: Akshita Jha <zenith158@gmail.com>

diff --git a/jjb/packaging/include-raw-build-rpm-snap.sh b/jjb/packaging/include-raw-build-rpm-snap.sh
index 67ccc8eeedc729675427daed4e6d27f95aed6853..16328f3ff376be09757957e8ca4f5694e742e28e 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm-snap.sh
+++ b/jjb/packaging/include-raw-build-rpm-snap.sh
@@ -17,6 +17,5 @@ pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
 "$WORKSPACE/packaging/rpm/build.py" --build-latest-snap \
                                   --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \
-                                  --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 74a75213825e22f018caa612944c59777fcfab96..ee99286b542e65b7a1e6b4d865b3f8a8aa761968 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm.sh
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -19,7 +19,6 @@ download_url="${{DOWNLOAD_URL//zip/tar.gz}}"
 
 # Build release specified by build params
 "$WORKSPACE/packaging/rpm/build.py" --download_url "$download_url" \
-                                  --sysd_commit "$SYSD_COMMIT" \
                                   --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 fb6f1d651791ba6b75f2330379a5b30e735ed97d..36dcb35336bbbf45ac5d9fef657e865409cf068a 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -75,10 +75,6 @@
           # yamllint disable-line rule:line-length
           default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.2-Boron/distribution-karaf-0.5.2-Boron.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
-      - string:
-          name: SYSD_COMMIT
-          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
-          description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
       - string:
           name: CHANGELOG_DATE
           default: 'Sun Aug 25 1991'
@@ -134,10 +130,6 @@
           name: VERSION_MINOR
           default: '0'
           description: 'OpenDaylight minor (SR) version number to build'
-      - string:
-          name: SYSD_COMMIT
-          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
-          description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'