Add 4.2.0-1.20160420.023809294 RPM

Build from merge job of bugfix described in this thread, reported by ODL
CI and OPNFV Apex.

lists.opendaylight.org/pipermail/integration-dev/2016-April/006459.html

Change-Id: Ia69e5011899a963653bdbbe7b4e05edcc158d8f7
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/rpm/build_vars.yaml b/rpm/build_vars.yaml
index 46f278acfb481d276ff8e677720b0c0d7019779f..7f727c021d092449b7b2cce12737836631a473b0 100644 (file)
--- a/rpm/build_vars.yaml
+++ b/rpm/build_vars.yaml
@@ -299,3 +299,15 @@ builds:
     changelog: |
       * Wed Apr 20 2016 Daniel Farrell <dfarrell@redhat.com> - 4.2.0-1.201604200031
       - Create Beryllium autorelease build 4.2.0-1.201604200031 RPM
+  - version_major: "4"
+    version_minor: "2"
+    version_patch: "0"
+    rpm_release: "1.20160420.023809294"
+    rpm_disttag: el7
+    java_version: ">= 1:1.7.0"
+    sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
+    codename: 20160420.023809-294
+    download_url: "https://nexus.opendaylight.org/service/local/repositories/opendaylight.snapshot/content/org/opendaylight/integration/distribution-karaf/0.4.2-SNAPSHOT/distribution-karaf-0.4.2-20160420.023809-294.tar.gz"
+    changelog: |
+      * Wed Apr 20 2016 Daniel Farrell <dfarrell@redhat.com> - 4.2.0-1.20160420.023809294
+      - Create Beryllium distribution build 4.2.0-1.20160420.023809294 RPM

diff --git a/rpm/specs/opendaylight-4.2.0-1.20160420.023809294.spec b/rpm/specs/opendaylight-4.2.0-1.20160420.023809294.spec
new file mode 100644 (file)
index 0000000..7f25cd0
--- /dev/null
+++ b/rpm/specs/opendaylight-4.2.0-1.20160420.023809294.spec
@@ -0,0 +1,70 @@
+# ODL is a noarch package, so this isn't necessary. It's also very slow.
+%define __jar_repack 0
+
+Name:       opendaylight
+Version:    4.2.0
+# The Fedora/CentOS packaging guidelines *require* the use of a disttag. ODL's
+#   RPM build doesn't do anything Fedora/CentOS specific, so the disttag is
+#   unnecessary and unused in our case, but both the docs and the pros (apevec)
+#   agree that we should include it.
+# See: https://fedoraproject.org/wiki/Packaging:DistTag
+Release:    1.20160420.023809294.el7
+BuildArch:  noarch
+Summary:    OpenDaylight SDN Controller
+Group:      Applications/Communications
+License:    EPL-1.0
+URL:        http://www.opendaylight.org
+Source0:    https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-20160420.023809-294/distribution-karaf-0.4.2-20160420.023809-294.tar.gz
+Source1:    %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service.tar.gz
+Buildroot:  /tmp
+# Required for ODL at run time
+Requires:   java >= 1:1.7.0
+# Required for creating odl group
+Requires(pre): shadow-utils
+# Required for configuring systemd
+BuildRequires: systemd
+
+%pre
+# Create `odl` user/group
+# Short circuits if the user/group already exists
+# Home dir must be a valid path for various files to be created in it
+getent passwd odl > /dev/null || useradd odl -M -d $RPM_BUILD_ROOT/opt/%name
+getent group odl > /dev/null || groupadd odl
+
+%description
+OpenDaylight 20160420.023809-294
+
+%prep
+# Extract Source0 (ODL archive)
+%autosetup -n distribution-karaf-0.4.2-20160420.023809-294
+# Extract Source1 (systemd config)
+%autosetup -T -D -b 1 -c -n %name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service
+
+%install
+# Create directory in build root for ODL
+mkdir -p $RPM_BUILD_ROOT/opt/%name
+# Copy ODL from archive to its dir in build root
+cp -r ../distribution-karaf-0.4.2-20160420.023809-294/* $RPM_BUILD_ROOT/opt/%name
+# Create directory in build root for systemd .service file
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+# Copy ODL's systemd .service file to correct dir in build root
+cp ../../BUILD/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service/%name-c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed.service $RPM_BUILD_ROOT/%{_unitdir}/%name.service
+
+%postun
+# When the RPM is removed, the subdirs containing new files wouldn't normally
+#   be deleted. Manually clean them up.
+#   Warning: This does assume there's no data there that should be preserved
+if [ $1 -eq 0 ]; then
+    rm -rf $RPM_BUILD_ROOT/opt/%name
+fi
+
+%files
+# ODL will run as odl:odl, set as user:group for ODL dir, don't override mode
+%attr(-,odl,odl) /opt/%name
+# Configure systemd unitfile user/group/mode
+%attr(0644,root,root) %{_unitdir}/%name.service
+
+
+%changelog
+* Wed Apr 20 2016 Daniel Farrell <dfarrell@redhat.com> - 4.2.0-1.20160420.023809294
+- Create Beryllium distribution build 4.2.0-1.20160420.023809294 RPM