diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 19 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 1 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 11 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex.spec | 4 |
4 files changed, 25 insertions, 10 deletions
diff --git a/build/Makefile b/build/Makefile index 74e72657..edc5832e 100644 --- a/build/Makefile +++ b/build/Makefile @@ -30,7 +30,7 @@ export QUAGGA_RPMS_DIR = $(QUAGGA_BUILD_DIR)/rpmbuild export RPM_DIR_ARGS = -D '_topdir $(BUILD_DIR)' -D '_builddir $(BUILD_DIR)' -D '_sourcedir $(BUILD_DIR)' -D '_rpmdir $(BUILD_DIR)' -D '_specdir $(BUILD_DIR)' -D '_srcrpmdir $(BUILD_DIR)' export RPMREL = $(BUILD_DIR)/noarch/opnfv-apex-release-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm -export RPMCOM = $(BUILD_DIR)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm +export RPMCOM = $(BUILD_DIR)/noarch/python34-opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMUDR = $(BUILD_DIR)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMODL = $(BUILD_DIR)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMONO = $(BUILD_DIR)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm @@ -49,13 +49,13 @@ clean-cache: rm -rf $(CACHE_DIR) .PHONY: images -images: undercloud overcloud-full overcloud-opendaylight overcloud-onos +images: undercloud overcloud-full overcloud-opendaylight .PHONY: rpms -rpms: images common-rpm undercloud-rpm opendaylight-rpm onos-rpm +rpms: images common-rpm undercloud-rpm opendaylight-rpm .PHONY: rpms-check -rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check +rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check .PHONY: rpms-clean rpms-clean: @@ -271,8 +271,17 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages @ln $(RPMODL) $(BUILD_DIR)/centos/Packages # add packages to the centos packages - cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe python2-virtualbmc python-pbr python-prettytable python-pyghmi python-crypto libvirt-python + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-asn1crypto-0.22.0-1.el7.centos.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-cryptography-2.0.3-1.el7.centos.x86_64.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-iptables-0.12.0-1.el7.centos.x86_64.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-libvirt-3.6.0-1.el7.centos.x86_64.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pbr-3.1.1-1.el7.centos.x86_64.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-PrettyTable-0.7.2-1.el7.centos.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pycrypto-2.6.1-1.el7.centos.x86_64.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pyghmi-1.0.22-1.el7.centos.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-virtualbmc-1.2.0-1.el7.centos.noarch.rpm # regenerate yum repo data @echo "Generating new yum metadata" createrepo --update -g $(BUILD_ROOT)/c7-opnfv-x86_64-comps.xml $(BUILD_DIR)/centos diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 775fcbfb..96b43d87 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -102,4 +102,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \ fi LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 +rm -f overcloud-full-opendaylight_build.qcow2 popd > /dev/null diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 42bc42f9..37e32145 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -1,6 +1,6 @@ %global srcname opnfv-apex -Name: python3-%{srcname} +Name: python34-%{srcname} Version: 5.0 Release: %{_release} Summary: Scripts for OPNFV deployment using Apex @@ -12,10 +12,11 @@ Source0: opnfv-apex-common.tar.gz BuildArch: noarch BuildRequires: python-docutils python34-devel -Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools libvirt-python -Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python2-virtualbmc +Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools python34-libvirt +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python34-virtualbmc Requires: ipxe-roms-qemu >= 20160127-1 -Requires: libvirt-devel +Requires: libvirt-devel ansible +Requires: python34-iptables python34-cryptography python34-pbr %description Scripts for OPNFV deployment using Apex @@ -112,6 +113,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-5 +- Updated requirements * Mon Aug 14 2017 Tim Rozet <trozet@redhat.com> - 5.0-4 - Updated for python refactoring * Mon May 08 2017 Dan Radez <dradez@redhat.com> - 5.0-3 diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 1e7c5620..fdda3025 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -10,7 +10,7 @@ Source0: opnfv-apex.tar.gz Provides: opnfv-apex-sdn BuildArch: noarch -Requires: opnfv-apex-common opnfv-apex-undercloud +Requires: python34-opnfv-apex opnfv-apex-undercloud %description Overcloud Disk images for OPNFV Apex OpenDaylight deployment @@ -34,6 +34,8 @@ install build/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/images/ %{_var}/opt/opnfv/images/overcloud-full.initrd %changelog +* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-3 +- Updated requirements * Fri May 26 2017 Tim Rozet <trozet@redhat.com> - 5.0-2 - Fixes missing ramdisk and kernel * Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1 |