From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- build/Makefile | 314 +++++++-------------------------------------------------- 1 file changed, 34 insertions(+), 280 deletions(-) (limited to 'build/Makefile') diff --git a/build/Makefile b/build/Makefile index fb6734b5..9b98f200 100644 --- a/build/Makefile +++ b/build/Makefile @@ -8,37 +8,24 @@ ############################################################################## export USE_MASTER = "" -export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.4.1708/isos/x86_64/CentOS-7-x86_64-DVD-1708.iso export RELEASE = "0" export RPM_DIST = $(shell rpm -E %dist) - -export NETVPP_VERS := $(shell grep Version $(shell pwd)/rpm_specs/networking-vpp.spec | head -n 1 | awk '{ print $$2 }') -export NETVPP_REPO := $(shell awk -F\= '/^netvpp_repo/ {print $$2}' variables.sh ) -export NETVPP_BRANCH := $(shell awk -F\= '/^netvpp_branch/ {print $$2}' variables.sh ) -export NETVPP_COMMIT := $(shell git ls-remote $(NETVPP_REPO) $(NETVPP_BRANCH) | awk '{print substr($$1,1,7)}') - -export RELRPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex-release.spec | head -n 1 | awk '{ print $$2 }') export RPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }') export BUILD_ROOT = $(shell pwd) export BUILD_DIR = $(shell dirname $$(pwd))/.build export CACHE_DIR = $(shell dirname $$(pwd))/.cache -export PATCHES_DIR = $(BUILD_ROOT)/patches -export QUAGGA_BUILD_DIR = $(BUILD_DIR)/quagga_build_dir -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/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 -export ISO = $(BUILD_DIR)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso -export CENTISO = $(BUILD_DIR)/$(shell basename $(CENTDNLD)) + +export NETVPP_VERS := $(shell grep Version $(shell pwd)/rpm_specs/networking-vpp.spec | head -n 1 | awk '{ print $$2 }') +export NETVPP_REPO := $(shell awk -F\= '/^netvpp_repo/ {print $$2}' variables.sh ) +export NETVPP_BRANCH := $(shell awk -F\= '/^netvpp_branch/ {print $$2}' variables.sh ) +export NETVPP_COMMIT := $(shell git ls-remote $(NETVPP_REPO) $(NETVPP_BRANCH) | awk '{print substr($$1,1,7)}') .PHONY: all -all: iso +all: rpm .PHONY: clean clean: @@ -48,50 +35,46 @@ clean: clean-cache: rm -rf $(CACHE_DIR) -.PHONY: images -images: undercloud overcloud-full overcloud-opendaylight +.PHONY: rpm-check +rpm-check: apex-rpm-check -.PHONY: rpms -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 - -.PHONY: rpms-clean -rpms-clean: +.PHONY: rpm-clean +rpm-clean: rm -rf $(BUILD_DIR)/noarch rm -rf $(BUILD_DIR)/BUILDROOT -$(BUILD_DIR)/opnfv-apex-release.tar.gz: +$(BUILD_DIR)/opnfv-apex.tar.gz: mkdir -p $(BUILD_DIR) - pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-release-$(RELRPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-release.tar.gz + pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex.tar.gz -.PHONY: release-rpm-check -release-rpm-check: $(BUILD_DIR)/opnfv-apex-release.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" +.PHONY: apex-rpm-check +apex-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" -.PHONY: release-rpm -release-rpm: $(BUILD_DIR)/opnfv-apex-release.tar.gz $(RPMREL) +.PHONY: rpm +apex-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMCOM) -$(RPMREL): - @echo "Building the Apex Release RPM" - # build the release RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" +$(RPMCOM): + @echo "Building the Apex RPM" + # build the Apex RPM + rpmbuild --clean -ba rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" -$(BUILD_DIR)/opnfv-apex-common.tar.gz: - pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-common.tar.gz -.PHONY: common-rpm-check -common-rpm-check: $(BUILD_DIR)/opnfv-apex-common.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" +################## +# NETWORKING-VPP # +################## + +$(BUILD_DIR)/python-networking-vpp.tar.gz: + @echo "Preparing the networking-vpp RPM prerequisites" + git clone $(NETVPP_REPO) -b $(NETVPP_BRANCH) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS) + tar czf $(BUILD_DIR)/python-networking-vpp.tar.gz -C $(BUILD_DIR) python-networking-vpp-$(NETVPP_VERS) -.PHONY: common-rpm -common-rpm: $(BUILD_DIR)/opnfv-apex-common.tar.gz $(RPMCOM) +.PHONY: networking-vpp-rpm +networking-vpp-rpm: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm -$(RPMCOM): - @echo "Building the Apex Common RPM" - # build the common RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" +$(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm: $(BUILD_DIR)/python-networking-vpp.tar.gz + @echo "Building the Networking VPP RPM" + rpmbuild --clean -ba --target noarch rpm_specs/networking-vpp.spec $(RPM_DIR_ARGS) -D 'git .git$(NETVPP_COMMIT)' ################## # PYTHON TESTS # @@ -126,232 +109,3 @@ rpmlint: @echo "Running rpmlint against all RPM spec files" rpmlint rpm_specs/*.spec -################## -# NETWORKING-VPP # -################## - -$(BUILD_DIR)/python-networking-vpp.tar.gz: - @echo "Preparing the networking-vpp RPM prerequisites" - git clone $(NETVPP_REPO) -b $(NETVPP_BRANCH) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS) - tar czf $(BUILD_DIR)/python-networking-vpp.tar.gz -C $(BUILD_DIR) python-networking-vpp-$(NETVPP_VERS) - -.PHONY: networking-vpp-rpm -networking-vpp-rpm: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm - -$(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm: $(BUILD_DIR)/python-networking-vpp.tar.gz - @echo "Building the Networking VPP RPM" - rpmbuild --clean -ba --target noarch rpm_specs/networking-vpp.spec $(RPM_DIR_ARGS) -D 'git .git$(NETVPP_COMMIT)' - -############### -# UNDERCLOUD # -############### - -.PHONY: undercloud -undercloud: $(BUILD_DIR)/undercloud.qcow2 - -$(BUILD_DIR)/undercloud.qcow2: - @echo "Building the Apex Undercloud Image" - @./undercloud.sh - -$(BUILD_DIR)/opnfv-apex-undercloud.tar.gz: $(BUILD_DIR)/undercloud.qcow2 - @echo "Preparing the Apex Undercloud RPM prerequisites" - pushd ../ && git archive --format=tar --prefix=opnfv-apex-undercloud-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-undercloud.tar - tar -rf $(BUILD_DIR)/opnfv-apex-undercloud.tar \ - --xform="s:.*undercloud.qcow2:opnfv-apex-undercloud-$(RPMVERS)/build/undercloud.qcow2:" $(BUILD_DIR)/undercloud.qcow2 - gzip -f $(BUILD_DIR)/opnfv-apex-undercloud.tar - -.PHONY: undercloud-rpm-check -undercloud-rpm-check: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" - -.PHONY: undercloud-rpm -undercloud-rpm: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz $(RPMUDR) - -$(RPMUDR): - @echo "Building the Apex Undercloud RPM" - rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" - -############### -# OVERCLOUD # -############### - -.PHONY: overcloud-full -overcloud-full: $(BUILD_DIR)/overcloud-full.qcow2 - -$(BUILD_DIR)/overcloud-full.qcow2: $(BUILD_DIR)/noarch/python-networking-vpp-*.noarch.rpm - @echo "Building the Apex Base Overcloud Image" - @./overcloud-full.sh - -############### -# ODL # -############### - -.PHONY: overcloud-opendaylight -overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 - -$(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 - @echo "Building the Apex OpenDaylight Overcloud Image" - @./overcloud-opendaylight.sh - -$(BUILD_DIR)/opnfv-apex.tar.gz: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 - tar -czf $(BUILD_DIR)/opnfv-apex.tar.gz --xform="s:.*/:opnfv-apex-$(RPMVERS)/build/:" $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 $(BUILD_DIR)/overcloud-full.initrd $(BUILD_DIR)/overcloud-full.vmlinuz - -.PHONY: opendaylight-rpm-check -opendaylight-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" - -.PHONY: opendaylight-rpm -opendaylight-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMODL) - -$(RPMODL): - @echo "Building the Apex OpenDaylight RPM" - # build the overcloud RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" - -############### -# ONOS # -############### - -.PHONY: overcloud-onos -overcloud-onos: $(BUILD_DIR)/overcloud-full-onos.qcow2 - -$(BUILD_DIR)/overcloud-full-onos.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 - @echo "Building the Apex ONOS Overcloud Image" - @./overcloud-onos.sh - -$(BUILD_DIR)/opnfv-apex-onos.tar.gz: $(BUILD_DIR)/overcloud-full-onos.qcow2 - tar -czf $(BUILD_DIR)/opnfv-apex-onos.tar.gz --xform="s:.*/:opnfv-apex-onos-$(RPMVERS)/build/:" $(BUILD_DIR)/overcloud-full-onos.qcow2 - -.PHONY: onos-rpm-check -onos-rpm-check: $(BUILD_DIR)/opnfv-apex-onos.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" - -.PHONY: onos-rpm -onos-rpm: $(BUILD_DIR)/opnfv-apex-onos.tar.gz $(RPMONO) - -$(RPMONO): - @echo "Building the Apex ONOS RPM" - # build the overcloud RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" - -############### -# ISO # -############### - -$(CENTISO): - curl $(CENTDNLD) -z $(CENTISO) -o $(CENTISO) --verbose --silent --location - -iso-clean: - @rm -Rf $(BUILD_DIR)/centos - @rm -Rf $(BUILD_DIR)/release - @rm -f $(ISO) - -.PHONY: mount-centiso umount-centiso -mount-centiso: $(CENTISO) - @echo "Mounting CentOS ISO in $(CENTDIR)" - @mkdir -p $(CENTDIR) - @fuseiso $(CENTISO) $(CENTDIR) - -umount-centiso: - @set +e - @echo "Unmounting CentOS ISO from $(CENTDIR)" - @fusermount -u $(CENTDIR) - @rmdir $(CENTDIR) - @set -e - -.PHONY: iso -iso: iso-clean images rpms $(CENTISO) - @echo "Building the Apex ISO" - @mkdir $(BUILD_DIR)/centos $(BUILD_DIR)/release - cd $(BUILD_DIR)/centos && bsdtar -xf ../$(shell basename $(CENTISO)) - # modify the installer iso's contents - @chmod -R u+w $(BUILD_DIR)/centos - @cp -f isolinux.cfg $(BUILD_DIR)/centos/isolinux/isolinux.cfg - @ln $(RPMCOM) $(BUILD_DIR)/centos/Packages - @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 - cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi - cd $(BUILD_DIR)/centos/Packages && yumdownloader ipxe-roms-qemu python34-idna python34-pycparser python-crypto python-httplib2 - cd $(BUILD_DIR)/centos/Packages && yumdownloader python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply - cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-python python-lxml python-passlib python2-jmespath - cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-urllib3 python34-pysocks python34-requests python34-chardet - 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 - cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-smmap2-2.0.3-1.el7.centos.noarch.rpm - cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-pygerrit2-2.0.3-1.el7.centos.noarch.rpm - cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-gitdb2-2.0.3-1.el7.centos.noarch.rpm - cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-GitPython-2.1.7-1.el7.centos.noarch.rpm - cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-distro-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 - # build the iso - @echo "Building OPNFV iso" - mkisofs -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -V "OPNFV CentOS 7 x86_64" -R -J -v -T -o $(ISO) $(BUILD_DIR)/centos - isohybrid $(ISO) - @printf "\n\nISO is built at $(ISO)\n\n" - -################## -# Quagga Clean # -################## -.PHONY: quagga-clean -quagga-clean: - @rm -rf $(QUAGGA_BUILD_DIR) - @sudo yum -y remove zrpc* quagga* c-capnproto* thrift* - -################# -# Quagga+ZRPC # -################# -.PHONY: quagga-zrpc -quagga-zrpc: quagga-clean thrift-rpm capnproto-rpm quagga-rpm zrpc-rpm - -########## -# ZRPC # -########## -.PHONY: zrpc-rpm -zrpc-rpm: quagga-rpm $(QUAGGA_RPMS_DIR)/zrpcd-%.x86_64.rpm - -$(QUAGGA_RPMS_DIR)/zrpcd-%.x86_64.rpm: - @echo "Building ZRPC RPM" - @./build_quagga.sh -a zrpc - -############ -# Quagga # -############ -.PHONY: quagga-rpm -quagga-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/quagga-1.1.0_%.el7.centos.x86_64.rpm - -$(QUAGGA_RPMS_DIR)/RPMS/x86_64/quagga-1.1.0_%.el7.centos.x86_64.rpm: - @echo "Building Quagga RPM" - @./build_quagga.sh -a quagga - -############### -# Capnproto # -############### -.PHONY: capnproto-rpm -capnproto-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/c-capnproto-%.x86_64.rpm - -$(QUAGGA_RPMS_DIR)/RPMS/x86_64/c-capnproto-%.x86_64.rpm: - @echo "Building capnproto RPMs" - @./build_quagga.sh -a capnproto - -############ -# Thrift # -############ - -.PHONY: thrift-rpm -thrift-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/thrift-%.x86_64.rpm - -$(QUAGGA_RPMS_DIR)/RPMS/x86_64/thrift-%.x86_64.rpm: - @echo "Building Thrift RPMs" - @./build_quagga.sh -a thrift -- cgit 1.2.3-korg