summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-08-23 15:57:25 -0400
committerFeng Pan <fpan@redhat.com>2016-08-24 02:23:11 +0000
commit8e6b196e50b0528f3e58ae148293d6713c3f977b (patch)
tree4464535dbbfbe9fee6c7731362fc6f0393a23830 /build
parent054eb0117602fe7b031a73d809965003ed9958d8 (diff)
Add honeycomb to build process
JIRA: APEX-133 Change-Id: I96b278996edc6897408111d31b9effe472fb0d10 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/Makefile18
-rw-r--r--build/mvn_settings.xml106
-rwxr-xr-xbuild/overcloud-opendaylight.sh3
3 files changed, 125 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile
index cefe474..85f7f8d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -156,27 +156,43 @@ openstack-congress-2016.1-1.noarch.rpm:
###############
VPP_DIR = vpp
+MAVEN = apache-maven-3.3.9
+MAVEN_FILE = $(MAVEN)-bin.tar.gz
.PHONY: vpp-clean
vpp-clean:
@rm -f vpp-bin.tar.gz
@rm -rf vpp-bin vpp
+ @rm -rf honeycomb $(MAVEN) $(MAVEN_FILE) honeycomb-1.0.0-99.noarch.rpm
.PHONY: vpp-build
vpp-build: vpp-bin.tar.gz
-vpp-bin.tar.gz: vpp
+vpp-bin.tar.gz: vpp honeycomb $(MAVEN)
$(MAKE) -C $(VPP_DIR) UNATTENDED=yes install-dep bootstrap build pkg-rpm
$(MAKE) -C $(VPP_DIR)/build-root PLATFORM=vpp TAG=vpp_debug vpp-api-install
pushd vpp/vpp-api/python && python setup.py bdist
+ pushd honeycomb && ../$(MAVEN)/bin/mvn clean install -DskipTests
+ pushd honeycomb/packaging/rpm/ && BUILD_NUMBER=99 ./rpmbuild.sh
mkdir vpp-bin
mv vpp/build-root/*.rpm vpp-bin/
+ mv honeycomb/packaging/rpm/RPMS/noarch/*.rpm .
mv vpp/vpp-api/python/dist/*.tar.gz vpp-bin/
tar czf vpp-bin.tar.gz vpp-bin
vpp:
git clone https://gerrit.fd.io/r/vpp
+honeycomb:
+ git clone https://gerrit.fd.io/r/p/honeycomb.git
+
+$(MAVEN): $(MAVEN_FILE)
+ tar zxvf apache-maven-3.3.9-bin.tar.gz
+ cp mvn_settings.xml $(MAVEN)/conf/settings.xml
+
+$(MAVEN_FILE):
+ wget http://www.webhostingjams.com/mirror/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+
###############
# UNDERCLOUD #
diff --git a/build/mvn_settings.xml b/build/mvn_settings.xml
new file mode 100644
index 0000000..c774461
--- /dev/null
+++ b/build/mvn_settings.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=2 tabstop=2: -->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <profiles>
+ <profile>
+ <id>fd.io-release</id>
+ <repositories>
+ <repository>
+ <id>fd.io-mirror</id>
+ <name>fd.io-mirror</name>
+ <url>https://nexus.fd.io/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>fd.io-mirror</id>
+ <name>fd.io-mirror</name>
+ <url>https://nexus.fd.io/content/repositories/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <profile>
+ <id>fd.io-snapshots</id>
+ <repositories>
+ <repository>
+ <id>fd.io-snapshot</id>
+ <name>fd.io-snapshot</name>
+ <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>fd.io-snapshot</id>
+ <name>fd.io-snapshot</name>
+ <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
+ <id>opendaylight-snapshots</id>
+ <repositories>
+ <repository>
+ <id>opendaylight-snapshot</id>
+ <name>opendaylight-snapshot</name>
+ <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>opendaylight-shapshot</id>
+ <name>opendaylight-snapshot</name>
+ <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>fd.io-release</activeProfile>
+ <activeProfile>fd.io-snapshots</activeProfile>
+ <activeProfile>opendaylight-snapshots</activeProfile>
+ </activeProfiles>
+</settings>
+
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 9b63ebc..621a427 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -67,7 +67,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
--run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
--run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
- --run-command "yum -y install https://github.com/marosmars/files/raw/master/honeycomb-1.0.0-99.noarch.rpm" \
+ --upload ../honeycomb-1.0.0-99.noarch.rpm:/root/ \
+ --run-command "yum -y install /root/honeycomb-1.0.0-99.noarch.rpm" \
--upload puppet-honeycomb.tar.gz:/etc/puppet/modules \
--run-command "cd /etc/puppet/modules && tar xzf puppet-honeycomb.tar.gz" \
--upload ./setup_TEPs.py:/tmp \