diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 41 | ||||
| -rw-r--r-- | build/c7-opnfv-x86_64-comps.xml | 18 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight-sfc.sh | 27 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-opendaylight-sfc.spec | 34 | ||||
| -rw-r--r-- | build/variables.sh | 4 |
5 files changed, 7 insertions, 117 deletions
diff --git a/build/Makefile b/build/Makefile index d17b8b52..9c66c82b 100644 --- a/build/Makefile +++ b/build/Makefile @@ -17,7 +17,6 @@ export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${ export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMONO = $(shell pwd)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm -export RPMSFC = $(shell pwd)/noarch/opnfv-apex-opendaylight-sfc-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm .PHONY: all @@ -27,20 +26,20 @@ all: iso clean: images-clean rpms-clean iso-clean tacker-clean congress-clean vpp-clean .PHONY: images -images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc +images: undercloud overcloud-full overcloud-opendaylight overcloud-onos .PHONY: images-clean -images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean overcloud-opendaylight-sfc-clean +images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean @rm -rf images/ .PHONY: rpms -rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm opendaylight-sfc-rpm +rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm .PHONY: rpms-check -rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check opendaylight-sfc-rpm-check +rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check .PHONY: rpms-clean -rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean opendaylight-sfc-rpm-clean +rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean opnfv-apex-common.tar.gz: pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz @@ -319,35 +318,6 @@ $(RPMONO): rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" ############### -# ODL-SFC # -############### - -.PHONY: overcloud-opendaylight-sfc-clean -overcloud-opendaylight-sfc-clean: - @rm -f images/overcloud-full-opendaylight-sfc.qcow2 - -.PHONY: overcloud-opendaylight-sfc -overcloud-opendaylight-sfc: images/overcloud-full-opendaylight-sfc.qcow2 - -images/overcloud-full-opendaylight-sfc.qcow2: images/overcloud-full-opendaylight.qcow2 - @echo "Building the Apex OpenDaylight Overcloud Image" - @./overcloud-opendaylight-sfc.sh - -opnfv-apex-opendaylight-sfc.tar.gz: images/overcloud-full-opendaylight-sfc.qcow2 - tar -czf opnfv-apex-opendaylight-sfc.tar.gz --xform="s:images/overcloud-full-opendaylight-sfc.qcow2:opnfv-apex-opendaylight-sfc-$(RPMVERS)/build/images/overcloud-full-opendaylight-sfc.qcow2:" images/overcloud-full-opendaylight-sfc.qcow2 - -.PHONY: opendaylight-sfc-rpm-check -opendaylight-sfc-rpm-check: opnfv-apex-opendaylight-sfc.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" - -.PHONY: opendaylight-sfc-rpm -opendaylight-sfc-rpm: opnfv-apex-opendaylight-sfc.tar.gz $(RPMSFC) - -$(RPMSFC): - @echo "Building the Apex OpenDaylight SFC RPM" - rpmbuild --clean -ba rpm_specs/opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" - -############### # ISO # ############### @@ -385,7 +355,6 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMUDR) centos/Packages @ln $(RPMODL) centos/Packages @ln $(RPMONO) centos/Packages - @ln $(RPMSFC) centos/Packages # add packages to the centos packages cd centos/Packages && yumdownloader openvswitch cd centos/Packages && yumdownloader openstack-tripleo diff --git a/build/c7-opnfv-x86_64-comps.xml b/build/c7-opnfv-x86_64-comps.xml index a9b0af0c..67a0e511 100644 --- a/build/c7-opnfv-x86_64-comps.xml +++ b/build/c7-opnfv-x86_64-comps.xml @@ -3,7 +3,7 @@ <comps> <group> <id>apex-opendaylight</id> - <name>OPNFV Apex OpenDaylight (non-sfc) Support</name> + <name>OPNFV Apex OpenDaylight Support</name> <description>Disk images and configuration files used to launch an Apex OpenDaylight deployment.</description> <default>false</default> <uservisible>false</uservisible> @@ -15,7 +15,7 @@ </group> <group> <id>apex-onos</id> - <name>OPNFV Apex ONOS (non-sfc) Support</name> + <name>OPNFV Apex ONOS Support</name> <description>Disk images and configuration files used to launch an Apex ONOS deployment.</description> <default>false</default> <uservisible>false</uservisible> @@ -26,18 +26,6 @@ </packagelist> </group> <group> - <id>apex-opendaylight-sfc</id> - <name>OPNFV Apex OpenDaylight SFC Support</name> - <description>Disk images and configuration files used to launch an Apex ODL SFC deployment.</description> - <default>false</default> - <uservisible>false</uservisible> - <packagelist> - <packagereq type="mandatory">opnfv-apex-opendaylight-sfc</packagereq> - <packagereq type="mandatory">opnfv-common</packagereq> - <packagereq type="mandatory">opnfv-undercloud</packagereq> - </packagelist> - </group> - <group> <id>additional-devel</id> <name>Additional Development</name> <name xml:lang="as">অতিৰিক্ত উন্নয়ন</name> @@ -7852,7 +7840,6 @@ <groupid>virtualization-tools</groupid> <groupid>apex-opendaylight</groupid> <groupid>apex-onos</groupid> - <groupid>apex-opendaylight-sfc</groupid> </grouplist> <optionlist> <groupid>virtualization-platform</groupid> @@ -7879,7 +7866,6 @@ <groupid>virtualization-tools</groupid> <groupid>apex-opendaylight</groupid> <groupid>apex-onos</groupid> - <groupid>apex-opendaylight-sfc</groupid> </grouplist> <optionlist> <groupid>kde-desktop</groupid> diff --git a/build/overcloud-opendaylight-sfc.sh b/build/overcloud-opendaylight-sfc.sh deleted file mode 100755 index 444d284a..00000000 --- a/build/overcloud-opendaylight-sfc.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e -source ./variables.sh -pushd images > /dev/null - -################################################ -##### Adding SFC+OpenDaylight overcloud ##### -################################################ - -#copy opendaylight overcloud full to odl-sfc -cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qcow2 - -# upgrade ovs into ovs 2.5.90 with NSH function -LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ - --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ - -a overcloud-full-opendaylight-sfc_build.qcow2 - -mv overcloud-full-opendaylight-sfc_build.qcow2 overcloud-full-opendaylight-sfc.qcow2 -popd > /dev/null diff --git a/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec b/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec deleted file mode 100644 index a63ec7c5..00000000 --- a/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec +++ /dev/null @@ -1,34 +0,0 @@ -Name: opnfv-apex-opendaylight-sfc -Version: 3.0 -Release: %{release} -Summary: Overcloud Disk images for OPNFV Apex OpenDaylight with SFC deployment - -Group: System Environment -License: Apache 2.0 -URL: https://gerrit.opnfv.org/gerrit/apex.git -Source0: opnfv-apex-opendaylight-sfc.tar.gz - -Provides: opnfv-apex-sdn -BuildArch: noarch -Requires: opnfv-apex-common opnfv-apex-undercloud - -%description -Overcloud Disk images for OPNFV Apex OpenDaylight with SFC deployment -https://wiki.opnfv.org/apex - -%prep -%setup -q - -%install -mkdir -p %{buildroot}%{_var}/opt/opnfv/images/ -install build/images/overcloud-full-opendaylight-sfc.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ - -%files -%defattr(644, root, root, -) -%{_var}/opt/opnfv/images/overcloud-full-opendaylight-sfc.qcow2 - -%changelog -* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0 -- Version update for Colorado -* Tue Jan 19 2016 Dan Radez <dradez@redhat.com> - 2.1-1 -- Initial Packaging diff --git a/build/variables.sh b/build/variables.sh index b26e7406..6d657186 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -37,10 +37,6 @@ fdio_pkgs=( ) honeycomb_pkg='honeycomb-1.16.9-FINAL.noarch.rpm' - -ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm -ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm - virt_uri_base=https://people.redhat.com/~rjones/libguestfs-RHEL-7.3-preview libguestfs_pkg='libguestfs-1.32.7-3.el7.x86_64.rpm' virt_pkgs=( |