integration/packaging.git
10 years agoMerge "Initial commit of docker image building support"
Luis Gomez [Wed, 22 Jan 2014 23:11:20 +0000 (23:11 +0000)]
Merge "Initial commit of docker image building support"

10 years agoMerge "Added distsuffix option to buildrpm.sh"
Luis Gomez [Wed, 22 Jan 2014 20:32:37 +0000 (20:32 +0000)]
Merge "Added distsuffix option to buildrpm.sh"

10 years agoInitial commit of docker image building support
David K. Bainbridge [Tue, 21 Jan 2014 21:11:10 +0000 (13:11 -0800)]
Initial commit of docker image building support

Signed-off-by: David K. Bainbridge <dbainbri@ciena.com>
10 years agoMerge "Remove the third party openflowjava jars. There jars are not used by anyone...
Luis Gomez [Tue, 21 Jan 2014 20:07:05 +0000 (20:07 +0000)]
Merge "Remove the third party openflowjava jars. There jars are not used by anyone and the deicision is to remove them for now."

10 years agoRemove the third party openflowjava jars.
Hsin-Yi Shen [Tue, 21 Jan 2014 18:45:25 +0000 (13:45 -0500)]
Remove the third party openflowjava jars.
There jars are not used by anyone and the deicision is to remove them for now.

Change-Id: I6e54f067742417b6da61b6100a82a5d2cbe35f90
Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
10 years agoAdded distsuffix option to buildrpm.sh
Miroslav Miklus [Tue, 21 Jan 2014 18:39:31 +0000 (19:39 +0100)]
Added distsuffix option to buildrpm.sh

- distsuffix option allows to define the package suffix

Change-Id: I4e8c24713f61096409d357be2392552efbcfe347
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
10 years agoMerge "Add rpm packaging for openflowjava and openflowpluging to buildrpm.sh."
Luis Gomez [Mon, 20 Jan 2014 22:57:06 +0000 (22:57 +0000)]
Merge "Add rpm packaging for openflowjava and openflowpluging to buildrpm.sh."

10 years agoMerge changes I854fecfa,Ief988528,Ibc50e28b
Luis Gomez [Mon, 20 Jan 2014 22:55:40 +0000 (22:55 +0000)]
Merge changes I854fecfa,Ief988528,Ibc50e28b

* changes:
  rpm/run.dist.sh: add usage statement
  rpm/run.dist.sh: fix commented out opendove command
  rpm/run.dist.sh: properly propagate exit code from helper scripts

10 years agoAdd rpm packaging for openflowjava and openflowpluging to buildrpm.sh.
Sam Hague [Sat, 18 Jan 2014 20:29:42 +0000 (15:29 -0500)]
Add rpm packaging for openflowjava and openflowpluging to buildrpm.sh.

- remove tabs in buildrpm.sh (for real this time)
- Added openflowjava and openflowplugin to buildrpm.sh
- Reworked projects to use arrays so it is easier to add new projects in the future.
- Added mockmvn option to allow rewriting the maven command used when mock builds the rpms. This is useful to allow specifying a local .m2 cache so moc
k does not clean and reinstall between every build.
- ensure git version tags are used throughout for all projects. This ensures the src.rpm files are marked with consistent git hashes for easier reprodu
cing of a build.
- Cleaned up distribution.spec Requires to not require controller-dependencies since it is Required by the controller already.
- Removed duplicate code in dependencies.spec.

Change-Id: Ic157e168893d3f163708b44c476dc9026cb8b240
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agorpm/run.dist.sh: add usage statement
Chris Wright [Sun, 19 Jan 2014 07:28:19 +0000 (23:28 -0800)]
rpm/run.dist.sh: add usage statement

when executed with invalid cmdline parameter or the new 'help' cmdline
parameter, print out a usage statement.

Change-Id: I854fecfaa897e9b6d0f85adb84707357d449a20b
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agorpm/run.dist.sh: fix commented out opendove command
Chris Wright [Sun, 19 Jan 2014 07:02:09 +0000 (23:02 -0800)]
rpm/run.dist.sh: fix commented out opendove command

run.dist.sh doesn't currently support launching conroller with
opendove.  if you were to uncomment the opendove launch command it
incorrectly references vtn.  update to reference opendove.

Change-Id: Ief98852884f1e413e4e6c70b13f2f4e34697379d
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agorpm/run.dist.sh: properly propagate exit code from helper scripts
Chris Wright [Sun, 19 Jan 2014 06:38:19 +0000 (22:38 -0800)]
rpm/run.dist.sh: properly propagate exit code from helper scripts

run.dist.sh will fork/exec helper scripts and exits with a hardcoded
value of 0 regardless of the helper script's exit code.  properly
propgate exit code by directly exec'ing the helper script.

Change-Id: Ibc50e28be5a38a34e6e170f7d59e334976aa9fb6
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
10 years agoAdd case for -status) case in run.dist.sh
Hsin-Yi Shen [Fri, 17 Jan 2014 18:27:11 +0000 (13:27 -0500)]
Add case for -status) case in run.dist.sh
This fix status option in RHEL sysv script.

Change-Id: I1b4f4037da87f23b0f4346431f98098296167bb1
Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
10 years agoAdd spec files for openflowjava and openflowplugin.
Hsin-Yi Shen [Sat, 11 Jan 2014 02:18:24 +0000 (21:18 -0500)]
Add spec files for openflowjava and openflowplugin.
controller spec and README are also updated for corresponding change.

Change-Id: I8247f896dba3513b801f1e2c852f64c55312a01d
Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
10 years agoMerge "Add distribution support to buildrpm.sh script."
Luis Gomez [Tue, 14 Jan 2014 03:13:40 +0000 (03:13 +0000)]
Merge "Add distribution support to buildrpm.sh script."

10 years agoAdd distribution support to buildrpm.sh script.
Sam Hague [Mon, 13 Jan 2014 03:17:30 +0000 (22:17 -0500)]
Add distribution support to buildrpm.sh script.

- Update script to include building the ovsdb and distribution rpms.
- Modularized parts of the script to make it easier to add in future projects that need to be included.
- Added a buildtag option to tag the output build directory.
- Added mockdebug option to enable or disable the mock debug.
- Cleaned up and added some logging.
- Added mockinit option to init mock.

Change-Id: Iaef906b365ee24d1bb7dd04d3b550bfa22bfaac7
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoUpdates to include new configuration files.
Sam Hague [Fri, 10 Jan 2014 16:32:50 +0000 (11:32 -0500)]
Updates to include new configuration files.

The latest controller distribution has added more configuration files that need to be mapped into the rpm packaging. Added:
- configuration/initial
- configuration/RSA.pk
- configuration/tomcat-logging.properties

Updated rpm/README to include build steps and instructiosn for using the rpms and systemctl.

Change-Id: If336a687cefdc810e3c6aa313779f9ffc8d6a5ea
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoAdd support for of1.3.
Sam Hague [Fri, 10 Jan 2014 13:33:04 +0000 (08:33 -0500)]
Add support for of1.3.

- Modified controller.spec to:
  - support the of1.3 option
  - support the three different run.sh scripts for the different distributions
- Added run.dist.sh script to wrap all the run.sh scripts. This file is called by the systemd and sys init scripts.
- Added patch file to modify the run.sh calls to run.internal.sh. The files assume run.internal.sh is in the same working directory as the wrapper run.sh which is not the case with systemd or sysv installs.
- Added distribution options to opendaylight-controller sysconfig. File is used to select the distribution to start.

Change-Id: Ia4daa92a8ce2237edd8ff5e242c40df53b04b8c3
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoMerge "Add spec file for opendove and vtn."
Luis Gomez [Wed, 8 Jan 2014 23:50:09 +0000 (23:50 +0000)]
Merge "Add spec file for opendove and vtn."

10 years agoAdd spec file for opendove and vtn.
Hsin-Yi Shen [Wed, 8 Jan 2014 20:43:08 +0000 (15:43 -0500)]
Add spec file for opendove and vtn.

Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
10 years agoMerge "Packaging update to support building ODL distributions."
Luis Gomez [Tue, 7 Jan 2014 17:24:52 +0000 (17:24 +0000)]
Merge "Packaging update to support building ODL distributions."

10 years agoMerge "Add RHEL support in spec file and remove fedora directory."
Luis Gomez [Tue, 7 Jan 2014 17:24:18 +0000 (17:24 +0000)]
Merge "Add RHEL support in spec file and remove fedora directory."

10 years agoPackaging update to support building ODL distributions.
Sam Hague [Mon, 6 Jan 2014 15:12:23 +0000 (10:12 -0500)]
Packaging update to support building ODL distributions.

This commit adds support for building the ODL OVSDB virtualization distribution.
- Added spec for building the ovsdb package
- Added distribution support to the controller spec. Mainly consists of adding
the integration run.sh wrapper script for run.sh.
- Updated dependencies.spec to also package ovsdb dependencies.
- Added spec for building the distribution. The spec simply Requires the
specific packages for the distribution. For example, it Requires the
controller, ovsdb and dependencies packages to support the OVSDB
virtualization package.

Change-Id: Iad931c46fc41bd107926dd9a41b5013638c55084
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoAdd RHEL support in spec file and remove fedora directory.
Hsin-Yi Shen [Tue, 24 Dec 2013 17:39:58 +0000 (12:39 -0500)]
Add RHEL support in spec file and remove fedora directory.

Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
10 years agoMerge "Add Nexus pushes to the mock builder"
Luis Gomez [Fri, 13 Dec 2013 21:13:11 +0000 (21:13 +0000)]
Merge "Add Nexus pushes to the mock builder"

10 years agoAdd Nexus pushes to the mock builder
Andrew Grimberg [Fri, 13 Dec 2013 18:46:37 +0000 (10:46 -0800)]
Add Nexus pushes to the mock builder

Add in an option for pushing the built RPM artifacts to Nexus.

Additional options have been added to the script to support selecting
the repository that a given artifact should push to.

Change-Id: Ic7ebd7ffb1132bc395870b83042bfe21663eff15
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
10 years agoAdd in verbose flag to mock
Andrew Grimberg [Sat, 7 Dec 2013 00:32:59 +0000 (16:32 -0800)]
Add in verbose flag to mock

Jenkins is a bit unhappy about the _very_ large pauses in output that
it's getting when we enter the mock build phase (multiple times). Add
the verbose flag to mock to keep Jenkins happy about this and also make
it easier to track where it is in the build process.

Change-Id: I2c15fc8161511b079eb96178980e2c909a710b91
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
10 years agoMinor fixups for mock and cloning clean-up
Andrew Grimberg [Fri, 6 Dec 2013 23:57:05 +0000 (15:57 -0800)]
Minor fixups for mock and cloning clean-up

The mock build location repository needs initialized for each run. Each
of the subsequent calls to mock can continue to use the --no-clean
feature of mock but not doing an initial --init causes it to bomb on
Jenkins managed systems.

Clone at --depth 0. The builds are only going to be pulling against the
current master HEAD or a particular version. We may want to change the
clones to be direct fetches to the snapshot tarball interface.

Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
10 years agoMerge "Add script to allow jenkins to automate the rpm builds."
Luis Gomez [Fri, 6 Dec 2013 20:27:42 +0000 (20:27 +0000)]
Merge "Add script to allow jenkins to automate the rpm builds."

10 years agoMerge "Add review comments and general cleanup."
Luis Gomez [Fri, 6 Dec 2013 18:39:41 +0000 (18:39 +0000)]
Merge "Add review comments and general cleanup."

10 years agoAdd script to allow jenkins to automate the rpm builds.
Sam Hague [Fri, 6 Dec 2013 00:06:05 +0000 (19:06 -0500)]
Add script to allow jenkins to automate the rpm builds.

bash script to:
- get the controlelr source via git clone or local clone
- use rpmbuild to create a src.rpm
- use mock to build the rpm.

The script can be called as follows to build the rpm with a local git repo:

~/git/integration/packaging/rpm/buildrpm.sh --dist fedora-19-x86_64 --getsource buildroot --buildtype snapshot --buildroot ~/data/rpmbuild --debug

The different options and help can be seen using:

buildrpm.sh -?

Change-Id: I317ec19e2c1b8830e1fbef98d497b50a81ea51db
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoAdd review comments and general cleanup.
Sam Hague [Tue, 19 Nov 2013 15:36:15 +0000 (10:36 -0500)]
Add review comments and general cleanup.

Change-Id: If24db025b5e5d60d4e61b3307191bcabacea8726
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoAdd *.swp files into the git ignore list.
Baohua Yang [Sun, 17 Nov 2013 12:14:27 +0000 (20:14 +0800)]
Add *.swp files into the git ignore list.

Change-Id: I83df5404691888f405f7ca3b6d65d2067850e800
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
10 years agoAdd *.pyc, log.html, output.xml and report.html to the ignore list.
Baohua Yang [Sun, 17 Nov 2013 12:13:19 +0000 (20:13 +0800)]
Add *.pyc, log.html, output.xml and report.html to the ignore list.

Change-Id: I615d11eff75b5e811b37568bbca9be8404b15d0d
Signed-off-by: Baohua Yang <baohyang@cn.ibm.com>
10 years agoMerge "Add Fedora systemd support to install the controller as a service."
Ed Warnicke [Thu, 7 Nov 2013 21:52:05 +0000 (21:52 +0000)]
Merge "Add Fedora systemd support to install the controller as a service."

10 years agoAdd Fedora systemd support to install the controller as a service.
Sam Hague [Thu, 7 Nov 2013 21:11:33 +0000 (16:11 -0500)]
Add Fedora systemd support to install the controller as a service.

- Add systemd support to install the service.
- Simplify the file permission modification logic.

The controller can be started and stopped via:

systemctl start|stop opendaylight-controller.service

or configured to start on boot via:

system enable opendaylight-controller.service

Change-Id: I9d2192558bd48e482e6a093b2b568af799c69028
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoAdd jar dependencies package.
Sam Hague [Fri, 1 Nov 2013 18:38:39 +0000 (14:38 -0400)]
Add jar dependencies package.

The current opendaylight-controller rpm uses the JAVA artifacts that
are already included in the distribution. This is not allowed in a
proper Fedora distribution. This commit creates a "dependencies"
package to remove the use of the pre-built artifacts from the
controller rpm. In the future this dependencies package will go
away as the artifacts are added in their own packages.

Change-Id: I7cc3891e6f18428b13133d8a0ff999ef1d79158c
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoMerge "Add initial Fedora RPM packaging."
Ed Warnicke [Fri, 25 Oct 2013 21:25:58 +0000 (21:25 +0000)]
Merge "Add initial Fedora RPM packaging."

10 years agoAdd initial Fedora RPM packaging.
Sam Hague [Fri, 25 Oct 2013 19:55:56 +0000 (15:55 -0400)]
Add initial Fedora RPM packaging.

This is an initial commit of the spec file to be used for a Fedora RPM
packaging of the controller. The spec relies on Maven to pull in the
JAVA artifacts. Anotehr dependencies RPm will be created to grab those
dependencies.

There is a README in the fedora folder that describes the process to
build the RPM, install and uninstall. The README also details how to
start the controller.

This is a work in progress. I wanted to commit the current spec to let
others take alook. The spec file has comments indicated by
"todo" to show the current thinking of what needs to be added.

Change-Id: Ie93cb57a8012033d0578fa87a4f2cf536d1b0d75
Signed-off-by: Sam Hague <shague@redhat.com>
10 years agoInitial commit of distributions (Base, Virtualization, Service Provider)
Ed Warnicke [Wed, 2 Oct 2013 04:15:43 +0000 (23:15 -0500)]
Initial commit of distributions (Base, Virtualization, Service Provider)

Change-Id: I6ef50dc5beb2394ee248c3f678210a58335b6ccd
Signed-off-by: Ed Warnicke <eaw@cisco.com>