diff options
Diffstat (limited to 'build/f_isoroot')
| -rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 7 | ||||
| -rw-r--r-- | build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 11 | ||||
| -rwxr-xr-x | build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 128 | ||||
| -rw-r--r-- | build/f_isoroot/f_tacker-pluginbuild/Makefile | 91 | ||||
| -rw-r--r-- | build/f_isoroot/f_tacker-pluginbuild/config.mk (renamed from build/f_isoroot/f_repobuild/config.mk) | 11 | ||||
| -rw-r--r-- | build/f_isoroot/f_tacker-pluginbuild/packages.yaml | 3 |
8 files changed, 204 insertions, 51 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 448f4158c..1539783c9 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have # verified it! -PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild +PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild f_tacker-pluginbuild #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild export PLUGINS #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 466aba2ae..55facfe4f 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -8,9 +8,8 @@ ############################################################################## FUEL_PLUGIN_ODL_BRANCH ?= master -FUEL_PLUGIN_ODL_CHANGE ?= 0ff4ebdbfe5f681f0b44eea14c9c2b3dbb10b1d5 +FUEL_PLUGIN_ODL_CHANGE ?= 7281b0db9171e5aeda0c23ba655f086a909395a1 FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git -export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz -export ODL_VERSION_NUMBER?=0.4.3 -export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC3.5.tar.gz +export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz +export ODL_VERSION_NUMBER?=0.5.0 diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk index 8effbd26b..f0392ac24 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -OVS_NSH_DPDK_BRANCH?=074aadce66ef3cf322a00a3cff5c57deb84088b5 +OVS_NSH_DPDK_BRANCH?=b3aed46ae0f1c86a1d6ad9058b2260844d591fbd OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs OVS_NSH_DPDK_CHANGE?= diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index 7c6b16304..8beb8824f 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -13,7 +13,6 @@ TOP := $(shell pwd) TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2) include ../../config.mk -include config.mk export MOS_VERSION export OPENSTACK_VERSION @@ -25,8 +24,7 @@ nailgun: sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml rm -Rf nailgun sudo mkdir -p /var/www/nailgun - git clone $(FUEL_MIRROR_REPO) - cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT) + ln -sf ${F_SUBMOD_DIR}/fuel-mirror fuel-mirror sudo pip install -U -r ./fuel-mirror/requirements.txt sudo pip install ./fuel-mirror sudo pip install ./fuel-mirror/contrib/fuel_mirror @@ -34,7 +32,7 @@ nailgun: sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu sudo chmod -R 755 /var/www/nailgun cp -Rp /var/www/nailgun . - # On the end we want to have ubuntu repository in mirrors/ubuntu directory + # In the end we want to have ubuntu repository in mirrors/ubuntu directory -if [ "$(MIRROR_UBUNTU_ROOT)" != "/ubuntu/" ]; then \ mkdir -p nailgun/mirrors/ubuntu;\ mv nailgun/mirrors$(MIRROR_UBUNTU_ROOT)* nailgun/mirrors/ubuntu;\ @@ -55,9 +53,9 @@ release:nailgun @cp -Rp nailgun ../release/opnfv/nailgun @cp fuel_bootstrap_cli.yaml ../release/opnfv/ -############################################################################# +############################################################################ # Cache operations - only used when building through ci/build.sh -############################################################################# +############################################################################ # Create a unique hash to be used for getting and putting cache, based on: # - Year and week (causing the cache to be rebuilt weekly) @@ -65,7 +63,6 @@ release:nailgun .cacheid: date +"Repocache %G%V" > .cachedata sha1sum Makefile >> .cachedata - sha1sum config.mk >> .cachedata $(CACHETOOL) packages >> .cachedata echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata cat .cachedata | $(CACHETOOL) getid > .cacheid diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index c3bb5cf36..24bd42234 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -1,38 +1,102 @@ #!/bin/bash -############################################################################## -# Copyright (c) 2015,2016 Ericsson AB and others. -# mskalski@mirantis.com -# 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 -############################################################################## - -# Try to choose close ubuntu mirror from mirrors.txt, but "whitewash" this -# against the full repo list to removed mirrors not up-to-date. - -# Some Ubuntu mirrors seem less reliable for this type of mirroring - -# as they are discoved they can be added to the blacklist below in order -# for them not to be considered. -BLACKLIST="mirror.clibre.uqam.ca" - -for url in $((curl -s https://launchpad.net/ubuntu/+archivemirrors | \ - grep -P -B8 "statusUP|statusSIX" | \ - grep -o -P "(f|ht)tp.*\"" | \ - sed 's/"$//' | sort | uniq; \ - curl -s http://mirrors.ubuntu.com/mirrors.txt | sort | uniq) | \ - sort | uniq -d) + +BLACKLIST="http://mirrors.se.eu.kernel.org/ubuntu/" +#BLACKLIST+=" http://foo.bar" + +cleanup() { + rm -f $TMPFILE +} + +debugmsg() { + test -n "$DEBUG" && echo "$@" >&2 +} + + +# Check if url is blacklisted in this script +blacklisted () { + for blackurl in $BLACKLIST + do + if [ "$1" == "$blackurl" ]; then + return 0 + fi + done + return 1 +} + + +# Check mirror's integrity +check_mirror () { + mirror=$1 + status=0 + for packdir in dists/trusty-updates/main/binary-amd64 \ + dists/trusty-updates/restricted/binary-amd64 \ + dists/trusty-updates/universe/binary-amd64 \ + dists/trusty-updates/multiverse/binary-amd64 \ + dists/trusty-security/main/binary-amd64 \ + dists/trusty-security/restricted/binary-amd64 \ + dists/trusty-security/universe/binary-amd64 \ + dists/trusty-security/multiverse/binary-amd64 \ + dists/trusty-proposed/main/binary-amd64 \ + dists/trusty-proposed/restricted/binary-amd64 \ + dists/trusty-proposed/universe/binary-amd64 \ + dists/trusty-proposed/multiverse/binary-amd64 \ + dists/trusty/main/binary-amd64 \ + dists/trusty/restricted/binary-amd64 \ + dists/trusty/universe/binary-amd64 \ + dists/trusty/multiverse/binary-amd64 \ + dists/trusty-backports/main/binary-amd64 \ + dists/trusty-backports/restricted/binary-amd64 \ + dists/trusty-backports/universe/binary-amd64 \ + dists/trusty-backports/multiverse/binary-amd64 + do + for packfile in Release Packages.gz + do + if [ $status -ne 1 ]; then + curl --output /dev/null --silent --head --fail \ + $mirror/$packdir/$packfile + if [ $? -ne 0 ]; then + debugmsg "$mirror: Faulty (at least missing $packdir/$packfile)" + status=1 + fi + fi + done + done + return $status +} + +if [ "$1" == "-d" ]; then + DEBUG=1 +fi + +# Hardcode for testing purposes +DEBUG=1 + +TMPFILE=$(mktemp /tmp/mirrorsXXXXX)A +trap cleanup exit + +# Generate a list of mirrors considered as "up" +curl -s https://launchpad.net/ubuntu/+archivemirrors | \ + grep -P -B8 "statusUP|statusSIX" | \ + grep -o -P "(f|ht)tp.*\"" | \ + sed 's/"$//' | sort | uniq > $TMPFILE + +# Iterate over "close" mirror, check that they are considered up +# and sane. +for url in $(curl -s http://mirrors.ubuntu.com/mirrors.txt) do - host=$(echo $url | cut -d'/' -f3) - echo ${BLACKLIST} | grep -q ${host} && continue - if curl -s -o /dev/null --head --fail "$url"; then - echo $url - exit 0 + if ! grep -q $url $TMPFILE; then + debugmsg "$url Faulty (detected by Ubuntu)" + elif blacklisted $url; then + debugmsg "$url blacklisted" + elif [ -z $BESTURL ]; then + if grep -q $url $TMPFILE && check_mirror $url; then + debugmsg "$url: OK (setting as primary URL)" + BESTURL=$url + test -z "$DEBUG" && break + fi else - continue + grep -q $url $TMPFILE && check_mirror $url && debugmsg "$url: OK" fi done -# If no suitable local mirror can be found, -# the default archive is returned instead. -echo "http://archive.ubuntu.com/ubuntu/" +echo "$BESTURL" diff --git a/build/f_isoroot/f_tacker-pluginbuild/Makefile b/build/f_isoroot/f_tacker-pluginbuild/Makefile new file mode 100644 index 000000000..997430de1 --- /dev/null +++ b/build/f_isoroot/f_tacker-pluginbuild/Makefile @@ -0,0 +1,91 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# geopar@intracom-telecom.com +# 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 +############################################################################## + +TOP := $(shell pwd) + +############################################################################ +# BEGIN of Include definitions +# +include config.mk +# +# END Include definitions +############################################################################# + + +.PHONY: all +all: .tackerbuild + +.PHONY: clean +clean: + @rm -f .tackerbuild ../release/opnfv/tacker*.rpm tacker*.rpm + @rm -f $(BUILD_BASE)/gitinfo_tackerplugin.txt gitinfo_tackerplugin.txt + +.PHONY: release +release:.tackerbuild + @rm -f ../release/opnfv/tacker*.rpm + @mkdir -p ../release/tacker + @cp tacker*.rpm ../release/opnfv/ + cp gitinfo_tackerplugin.txt $(BUILD_BASE) + +.tackerbuild: + rm -rf fuel-plugin-tacker + git clone $(TACKER_REPO) + cd fuel-plugin-tacker; \ + git checkout $(TACKER_BRANCH); \ + if [ ! -z $(TACKER_CHANGE) ]; then \ + git fetch $(TACKER_REPO) $(TACKER_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + fpb --debug --build fuel-plugin-tacker/ + @mv fuel-plugin-tacker/tacker*.rpm . + $(REPOINFO) -r . > gitinfo_tackerplugin.txt + @rm -rf fuel-plugin-tacker + @touch .tackerbuild + # Store artifact in cache straight away if caching is enabled + # (no .cacheid will be present unless this is a cached build) + test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0 + +############################################################################# +# Cache operations - only used when building through ci/build.sh +############################################################################# + + +# Create a unique hash to be used for getting and putting cache, based on: +# - The SHA1 hash of the HEAD on the plugin repo's $(TACKER_BRANCH) +# - The contents of this Makefile +.cacheid: + @if [ ! -z $(TACKER_CHANGE) ]; then \ + $(CACHETOOL) getcommitid $(TACKER_REPO) $(TACKER_CHANGE) > .cachedata; \ + else \ + $(CACHETOOL) getcommitid $(TACKER_REPO) $(TACKER_BRANCH) > .cachedata; \ + fi + @sha1sum Makefile | awk {'print $$1'} >> .cachedata + @sha1sum config.mk | awk {'print $$1'} >> .cachedata + @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata + @cat .cachedata | $(CACHETOOL) getid > .cacheid + +# Clean local data related to caching - called prior to ordinary build +.PHONY: clean-cache +clean-cache: clean + @rm -f .cachedata .cacheid + +# Try to download cache - called prior to ordinary build +.PHONY: get-cache +get-cache: .cacheid + @if $(CACHETOOL) check $(shell cat .cacheid); then \ + $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\ + else \ + echo "No cache item found for $(shell cat .cacheid)" ;\ + exit 0;\ + fi + +# Store cache if not already stored - called after ordinary build +.PHONY: put-cache +put-cache: .cacheid + @tar cf - .tackerbuild tacker*.rpm gitinfo_tackerplugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_repobuild/config.mk b/build/f_isoroot/f_tacker-pluginbuild/config.mk index d81732849..2de94d57e 100644 --- a/build/f_isoroot/f_repobuild/config.mk +++ b/build/f_isoroot/f_tacker-pluginbuild/config.mk @@ -1,13 +1,12 @@ ############################################################################## -# Copyright (c) 2016 Ericsson AB and others. -# mskalski@mirantis.com +# Copyright (c) 2015 Ericsson AB and others. +# geopar@intracom-telecom.com # 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 ############################################################################## -FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror -# Point to the commit where 302 redirects are handled -# https://bugs.launchpad.net/fuel/mitaka/+bug/1593674 -FUEL_MIRROR_COMMIT?=192a3d9f8f993afb12c5108dd9339c6688c23e11 +TACKER_BRANCH?=master +TACKER_REPO?="https://github.com/openstack/fuel-plugin-tacker" +TACKER_CHANGE?=e49db23fa2392e2cc42ac15ce22e869ff9cb0e0c diff --git a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml new file mode 100644 index 000000000..c7775d120 --- /dev/null +++ b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml @@ -0,0 +1,3 @@ +packages: + - python-jsonrpclib + |