summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/Makefile259
-rw-r--r--build/README22
-rw-r--r--build/add_opnfv_packages23
-rw-r--r--build/apply_patches18
-rw-r--r--build/cache.mk55
-rwxr-xr-xbuild/cache.sh203
-rwxr-xr-xbuild/check_dependencies.sh41
-rw-r--r--build/config.mk72
-rw-r--r--build/docker/.gitignore2
-rw-r--r--build/docker/Dockerfile46
-rw-r--r--build/docker/Makefile103
-rw-r--r--build/docker/README25
-rwxr-xr-xbuild/docker/runcontext132
-rwxr-xr-xbuild/docker/ubuntu-builder/install_docker.sh36
-rwxr-xr-xbuild/docker/ubuntu-builder/setcontext20
-rw-r--r--build/f_isoroot/Makefile46
-rw-r--r--build/f_isoroot/README16
-rw-r--r--build/f_isoroot/cache.mk37
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/Makefile97
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_bootstrap/Makefile46
-rw-r--r--build/f_isoroot/f_bootstrap/README24
-rwxr-xr-xbuild/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh14
-rwxr-xr-xbuild/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh29
-rwxr-xr-xbuild/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh14
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile92
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk13
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml9
-rw-r--r--build/f_isoroot/f_congress-pluginbuild/Makefile91
-rw-r--r--build/f_isoroot/f_congress-pluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_isolinux/Makefile49
-rw-r--r--build/f_isoroot/f_kscfg/Makefile50
-rw-r--r--build/f_isoroot/f_kscfg/README18
-rw-r--r--build/f_isoroot/f_kscfg/ks.cfg.patch31
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/Makefile92
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_odlpluginbuild/Makefile83
-rw-r--r--build/f_isoroot/f_odlpluginbuild/config.mk15
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/Makefile90
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/config.mk11
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile91
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_repobuild/.gitignore4
-rw-r--r--build/f_isoroot/f_repobuild/Makefile88
-rw-r--r--build/f_isoroot/f_repobuild/config.mk23
-rw-r--r--build/f_isoroot/f_repobuild/opnfv_config.yaml174
-rwxr-xr-xbuild/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py280
-rwxr-xr-xbuild/f_isoroot/f_repobuild/select_ubuntu_repo.sh103
-rw-r--r--build/f_isoroot/f_tacker-pluginbuild/Makefile91
-rw-r--r--build/f_isoroot/f_tacker-pluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_tacker-pluginbuild/packages.yaml3
-rw-r--r--build/f_isoroot/f_vsperfpluginbuild/Makefile92
-rw-r--r--build/f_isoroot/f_vsperfpluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_yardstick-pluginbuild/Makefile92
-rw-r--r--build/f_isoroot/f_yardstick-pluginbuild/config.mk13
-rwxr-xr-xbuild/fuel_build_loop31
-rw-r--r--build/install/apt-ftparchive-deb.conf33
-rw-r--r--build/install/apt-ftparchive-release.conf18
-rw-r--r--build/install/apt-ftparchive-udeb.conf33
-rwxr-xr-xbuild/install/install.sh491
-rwxr-xr-xbuild/install/uninstall.sh79
-rw-r--r--build/patch-packages/Makefile26
-rwxr-xr-xbuild/patch-packages/tools/correct_deps78
-rwxr-xr-xbuild/patch-packages/tools/deb_pack63
-rwxr-xr-xbuild/patch-packages/tools/deb_unpack58
-rwxr-xr-xbuild/patch-packages/tools/udeb_pack38
-rwxr-xr-xbuild/patch-packages/tools/udeb_unpack58
-rw-r--r--build/patch-packages/tr_example/Makefile30
-rwxr-xr-xbuild/repo_info.sh63
-rwxr-xr-xbuild/select_closest_fuel_mirror.py35
70 files changed, 0 insertions, 4284 deletions
diff --git a/build/Makefile b/build/Makefile
deleted file mode 100644
index 6ce6dbd9c..000000000
--- a/build/Makefile
+++ /dev/null
@@ -1,259 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-SHELL = /bin/bash
-
-# This file will be created if needed by runcontext to contain proxy
-# settings.
--include environment.mk
-
-############################################################################
-# BEGIN of variables to customize
-#
-#Input args
-export MOSVERSION = 10.0
-export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
-export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
-export PRODNO ?= "OPNFV_FUEL"
-export REVSTATE = "P0000"
-export USER ?= $(shell whoami)
-export BUILD_DATE = $(shell date --utc +%Y-%m-%d:%H:%M)
-export OPNFV_GIT_SHA ?= $(shell git rev-parse HEAD)
-# Store in /etc/fuel_build_id on fuel master
-export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA)
-
-ifdef BUILD_FUEL_PLUGINS
-$(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
-export NEWISO = $(shell pwd)/release/unofficial-opnfv-${REVSTATE}.iso
-else
-export NEWISO = $(shell pwd)/release/opnfv-${REVSTATE}.iso
-endif
-
-# Note! Invoke with "make REVSTATE=RXXXX all" to make release build!
-# Invoke with ICOCACHE=/full/path/to/iso if cached ISO is in non-standard location.
-
-# Build variables
-export BUILD_BASE := $(shell pwd)
-export DEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/main
-export UDEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/debian-installer
-export PUPPET_DEST := $(BUILD_BASE)/release/puppet/modules
-export VERSION_FILE := $(BUILD_BASE)/.versions
-export DOCKERIMG = opnfv.org/ubuntu-builder:14.04
-export TOPDIR := $(shell pwd)
-export REPOINFO := $(BUILD_BASE)/repo_info.sh
-
-# Use snapshots
-# Use nearby repositories
-export MIRROR_UBUNTU_URL ?= $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh)
-export MIRROR_UBUNTU ?= $(shell echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f3 )
-export MIRROR_UBUNTU_ROOT ?= $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f4-)
-ifeq (,$(MIRROR_UBUNTU_URL))
-$(warning $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh -d))
-$(error No sane Ubuntu mirror available)
-endif
-
-export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
-
-export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
-export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
-export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
-export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
-export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
-
-# uncomment and use: make print-VARIABLE
-#print-% : ; @echo $* = $($*)
-
-#Build subclasses
-
-SUBDIRS := f_isoroot
-
-# f_example is only an example of how to generate a .deb package and
-# should not be enabled in official builds.
-#SUBDIRS += f_example
-
-ORIGDIR := $(TOPDIR)/origiso
-#
-# END of variables to customize
-#############################################################################
-
-FUEL_MAIN_DIR := /tmp/fuel-main
-
-SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
-
-.PHONY: all
-all:
- @docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
- @make -C docker
- @lsb_release -a | grep Ubuntu > /dev/null 2>&1 || (echo 'Ubuntu is the only supported Linux distribution for this build system'; exit 1)
- @KERNEL_VER=$$(uname -r); \
- KERNEL_ARRAY=($${KERNEL_VER//./ }); \
- if [ $${KERNEL_ARRAY[0]} -lt 3 ] || [[ $${KERNEL_ARRAY[0]} -eq 3 && $${KERNEL_ARRAY[1]} -lt 19 ]] ; then (echo 'Kernel version must be 3.19 or newer'; exit 1) ; fi
- @docker/runcontext $(DOCKERIMG) wget -q www.google.com -O /dev/null || (echo 'No docker network connectivity or name server - check your network- and docker settings'; exit 1)
- @docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso
-
-
-############################################################################
-# BEGIN of Include definitions
-#
-include config.mk
-include cache.mk
-#
-# END Include definitions
-#############################################################################
-
-$(ISOCACHE):
- # Clone Fuel to non-persistent location and build
- sudo rm -rf $(FUEL_MAIN_DIR)
- $(MAKE) -C f_repos -f Makefile release
- git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR)
- # Save upstream ref, checkout OPNFV tag (upstream ref + patches)
- @echo "fuel" `git -C $(FUEL_MAIN_DIR) \
- rev-parse $(F_OPNFV_TAG)-root` >> $(VERSION_FILE)
- git -C $(FUEL_MAIN_DIR) checkout $(F_OPNFV_TAG)
- # Remove Docker optimizations, otherwise multistrap will fail during
- # Fuel build.
- sudo rm -f /etc/apt/apt.conf.d/docker*
- #
- # Need to replace the old Docker v. 1.5.0 with a later version to be
- # able to access the Docker remote repository!
- sudo apt-get install apt-transport-https ca-certificates -y
- sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
- echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
- sudo apt-get update -y
- sudo apt-get install docker-engine -y
- sudo sh -c 'echo DOCKER_OPTS=\"--bip 172.45.0.1/24\" > /etc/default/docker'
- sudo service docker stop || exit 0
- sudo service docker start
-
- cd $(FUEL_MAIN_DIR) && ./prepare-build-env.sh
- # Verify that Docker is alive
- sudo docker info
- # fuel-main Makefiles do not like `make -C`
- cd $(FUEL_MAIN_DIR) && make repos
- cp f_repos/.cachefuelinfo gitinfo_fuel.txt
-
- # Repeat build up to three times
- sudo -E ./fuel_build_loop
- cp $(FUEL_MAIN_DIR)/build/artifacts/fuel*.iso .
- # 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
-
-.PHONY: mount-origiso umount-origiso
-mount-origiso: $(ISOCACHE)
- @echo "Mounting original ISO in $(ORIGDIR)"
- @mkdir -p $(ORIGDIR)
- @fuseiso $(ISOCACHE) $(ORIGDIR)
-
-umount-origiso:
- @echo "Unmounting original ISO from $(ORIGDIR)"
- @fusermount -u $(ORIGDIR)
- @rmdir $(ORIGDIR)
-
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
- @mkdir -p release/packages/ubuntu/pool/main release/packages/ubuntu/pool/debian-installer release/puppet/modules release/isoroot
- $(MAKE) -C $@ -f Makefile release
-
-.PHONY: patch-packages
-patch-packages:
- ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
-
-.PHONY: clean $(SUBCLEAN)
-clean: $(SUBCLEAN)
- $(MAKE) -C f_repos -f Makefile clean
- $(MAKE) -C patch-packages -f Makefile clean
- @rm -f *.iso
- @rm -Rf release
- @rm -Rf newiso
- @rm -Rf .versions
- @rm -f $(NEWISO)
- @rm -f $(BUILD_BASE)/gitinfo_*.txt
-
-.PHONY: deepclean
-deepclean: clean clean-cache
- $(MAKE) -C f_repos -f Makefile deepclean
- $(MAKE) -C docker clean
- docker rmi opnfv.org/ubuntu-builder:14.04 &>/dev/null || exit 0
- docker rmi opnfv.org/ubuntu-builder:latest &>/dev/null || exit 0
- docker rmi ubuntu:14.04 &>/dev/null || exit 0
- @if docker images | grep -q "^ubuntu *14.04"; then \
- echo "Error: ubuntu:14.04 still present!"; \
- exit 1; \
- fi
- @if docker images | grep -q "opnfv.org/ubuntu-builder"; then \
- echo "Error: opnfv.org/ubuntu-builder still present!"; \
- exit 1; \
- fi
-
-$(SUBCLEAN): %.clean:
- $(MAKE) -C $* -f Makefile clean
-
-.PHONY: setup-env
-setup-env:
- @if [ -f environment.mk ]; then \
- sudo bash -c "cat environment.mk >> /etc/environment"; \
- fi
-
-# Todo: Make things smarter - we shouldn't need to clean everything
-# betwen make invocations.
-.PHONY: iso
-iso: setup-env $(ISOCACHE) $(SUBDIRS) patch-packages
- $(REPOINFO) . > gitinfo_main.txt
- install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
- @printf "\n\nProduct ISO is $(NEWISO)\n\n"
-
-# Start a bash shell in docker for Makefile debugging
-.PHONY: debug
-debug:
- @docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
- @make -C docker
- docker/runcontext $(DOCKERIMG) debug
-
-#############################################################################
-# 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 commit ID of the full Fuel repo structure
-# - The contents of all local Fuel patches
-# - Makefile, config and sensitive build scripts fingerprints
-# NOTE: Patching is deterministic, so we can fingerprint (submodule root commit
-# info + OPNFV patches) at once, after patches-import.
-# NOTE: When git submodule remote tracking is active, `git submodule status`
-# will point to the latest commits (remote/branch/HEAD) + OPNFV patches.
-.cacheid:
- $(MAKE) -C f_repos -f Makefile get-cache release
- git submodule status | cut -c2-41 > .cachedata
- sha1sum fuel_build_loop >> .cachedata
- sha1sum config.mk >> .cachedata
- sha1sum Makefile >> .cachedata
- $(CACHETOOL) getbiweek >> .cachedata
- cat .cachedata | $(CACHETOOL) getid > .cacheid
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: $(SUBCLEANCACHE)
- $(MAKE) -C f_repos -f Makefile clean-cache
- 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 \
- exit 0;\
- fi
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache: .cacheid
- @tar cf - fuel*.iso gitinfo_fuel.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/README b/build/README
deleted file mode 100644
index a6e15694c..000000000
--- a/build/README
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This purpose of this framework is to:
-
-1) Build fuel baseline from upstream OpenStack Fuel repos (builds in a docker container to isolate dependencies from host
- and full re-producability)
-2) Apply arbitrary changes to the fuel baseline, consistent and non volatile:
- - Add arbitrary packages with puppet modules for install and config. to be applied on controllers as well as computes.
- - Change any stack-, or other pack config. using puppet
- - Apply patches to the baseline.
- - Etc.
-3) Re factor/rebuild the .iso image for deployment (also builds in a container, for the same reason as mentioned above)
-
-For detailed instructions on how to add content, configuration, build and deply - please see: DOC/
diff --git a/build/add_opnfv_packages b/build/add_opnfv_packages
deleted file mode 100644
index 44af92ea7..000000000
--- a/build/add_opnfv_packages
+++ /dev/null
@@ -1,23 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# Format of this file:
-#
-#TEXT>old package>url for replacement package
-#
-# Note! No spaces!
-# The TEXT can be anything it is just for information display.
-# Iff the packages is new, i.e. not replacing an existing package
-# the old package should be specified as NONE.
-# Note! For new packages a puppet manifest must actually install it.
-# Easiest is to just add it to add_packages.pp. (The same might
-# of course be true for an exising package if it isn't already
-# is being installed).
-#
diff --git a/build/apply_patches b/build/apply_patches
deleted file mode 100644
index 6925ff6b7..000000000
--- a/build/apply_patches
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# Format of this file:
-#
-#TR>old package>url for replacement package
-#
-# Note! No spaces!
-# Example:
-#FIX>foo_0.0.1.deb>https://example.org/foo_0.0.2.deb
-
diff --git a/build/cache.mk b/build/cache.mk
deleted file mode 100644
index a65f310d0..000000000
--- a/build/cache.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#
-# This is the global cache implementation, providing the main target "cache"
-# which is called from ci/build.sh, and recursively calling the cache
-# operations clean-cache, get-cache and put-cache on all $(SUBDIRS).
-#############################################################################
-
-
-export CACHETOOL := $(BUILD_BASE)/cache.sh
-
-# Call sub caches
-SUBGETCACHE = $(addsuffix .getcache,$(SUBDIRS))
-$(SUBGETCACHE): %.getcache:
- $(MAKE) -C $* -f Makefile get-cache
-
-SUBPUTCACHE = $(addsuffix .putcache,$(SUBDIRS))
-$(SUBPUTCACHE): %.putcache:
- $(MAKE) -C $* -f Makefile put-cache
-
-SUBCLEANCACHE = $(addsuffix .cleancache,$(SUBDIRS))
-$(SUBCLEANCACHE): %.cleancache:
- $(MAKE) -C $* -f Makefile clean-cache
-
-# Overlay implementation:
-# - clean
-# - clean cache identities
-# - get caches
-# - build iso
-# - store caches
-.PHONY: cached-all
-cached-all: clean clean-cache $(SUBCLEANCACHE) get-cache $(SUBGETCACHE) iso put-cache $(SUBPUTCACHE)
- @echo "Cached build is complete"
-
-
-# cache: The target for ci/build.sh
-.PHONY: cache
-cache:
- @if [ -z "${CACHEBASE}" ]; then \
- echo "CACHEBASE not set, are you really building through build.sh?"; \
- exit 1; \
- fi
- @docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
- @make -C docker get-cache all
- docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) cached-all
diff --git a/build/cache.sh b/build/cache.sh
deleted file mode 100755
index d4b2c45dd..000000000
--- a/build/cache.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-exit_trap() {
- if [ -d "$TMPDIR" ]; then
- rm -rf $TMPDIR
- fi
-}
-
-trap exit_trap EXIT
-
-CACHETRANSPORT=${CACHETRANSPORT:-"curl --silent"}
-CACHEMAXAGE=${CACHEMAXAGE:-$[14*24*3600]}
-CACHEDEBUG=${CACHEDEBUG:-1}
-PLUGINS_MATCH="${BUILD_BASE}/f_isoroot/*/"
-
-debugmsg () {
- if [ "$CACHEDEBUG" -eq 1 ]; then
- echo "$@" >&2
- fi
-}
-
-errorexit () {
- echo "$@" >&2
- exit 1
-}
-
-# Generate a unique number every two weeks - a service routine that
-# can be used when generating the SHA1 to make sure that the cache is
-# rebuilt bi-weekly even if no pruning of the cache is taking place.
-getbiweek () {
- echo "$(date +'%G')$[10#$(date +'%V')/2]"
-}
-
-# Get a SHA1 based on what's piped into the cache command
-getid() {
- debugmsg "Generating sha1sum"
- sha1sum | sed 's/ .*//'
-}
-
-
-# Put in cache
-put() {
- if check $1; then
- debugmsg "SHA1 $1 already in cache, skipping storage"
- else
- debugmsg "Storing SHA1 $1 in cache"
- ${CACHETRANSPORT} -T - ${CACHEBASE}/$1.blob
- echo "Expires: $[`date +"%s"` + $CACHEMAXAGE]" | ${CACHETRANSPORT} -T - ${CACHEBASE}/$1.meta
- fi
- exit 0
-}
-
-# Get from cache
-get() {
- local rc
-
- ${CACHETRANSPORT} -o - ${CACHEBASE}/$1.blob 2>/dev/null
- rc=$?
-
- if [ $rc -eq 0 ]; then
- echo "Got SHA1 $1 from cache" 2>/dev/null
- else
- echo "Tried to get SHA1 $1 from cache but failed" 2>/dev/null
- fi
-
- return $?
-}
-
-# Check if in cache
-check() {
- local rc
-
- ${CACHETRANSPORT} ${CACHEBASE}/$1.meta &>/dev/null
- rc=$?
-
- if [ $rc -eq 0 ]; then
- debugmsg "Checking for SHA1 $1 in cache and found it, rc = $rc"
- else
- debugmsg "Checking for SHA1 $1 in cache and failed, rc = $rc"
- fi
-
- return $rc
-}
-
-# Verify that SHA1 seems to be a SHA1...
-validSHA1() {
- if [ $(echo $1 | wc -c) -ne 41 ]; then
- return 1
- else
- return 0
- fi
-}
-
-# Figure out commit ID from URI and tag/branch/commit ID
-getcommitid() {
- if echo $2 | grep -q '^refs/changes/'; then
- REF=`echo $2 | sed "s,refs\/changes\/\(.*\),\1,"`
- else
- REF=$2
- fi
-
- echo "Repo is $1, ref is ${REF}" >&2
-
- HEADMATCH=`git ls-remote $1 | grep "refs/heads/${REF}$" | awk '{ print $1 }'`
- TAGMATCH=`git ls-remote $1 | grep "refs/tags/${REF}$" | awk '{ print $1 }'`
- CHANGEMATCH=`git ls-remote $1 | grep "refs/changes/${REF}$" | awk '{ print $1 }'`
-
- if [ -n "$HEADMATCH" ]; then
- echo "$HEADMATCH"
- elif [ -n "$TAGMATCH" ]; then
- echo "$TAGMATCH"
- elif [ -n "$CHANGEMATCH" ]; then
- echo "Warning: ${REF} is a change!" >&2
- TMPDIR=`mktemp -d /tmp/cacheXXXXX`
- cd $TMPDIR
- git clone $1 &>/dev/null || errorexit "Could not clone $1"
- cd * || errorexit "Could not enter clone of $1"
- git fetch $1 refs/changes/$REF &>/dev/null || errorexit "Could not fetch change"
- git checkout FETCH_HEAD &>/dev/null || errorexit "Could not checkout FETCH_HEAD"
- git show HEAD &>/dev/null || errorexit "Could not find commit $2"
- git show HEAD | head -1 | awk '{ print $2 }'
- else
- TMPDIR=`mktemp -d /tmp/cacheXXXXX`
- cd $TMPDIR
- git clone $1 &>/dev/null || errorexit "Could not clone $1"
- cd * || errorexit "Could not enter clone of $1"
- git show $2 &>/dev/null || errorexit "Could not find commit $2"
- git show $2 | head -1 | awk '{ print $2 }'
- fi
-}
-
-packages() {
- local PLUGINS_SHA1=''
-
- # globbing expansion is alphabetical
- for plugin in $PLUGINS_MATCH ; do
- if [ -f "${plugin}packages.yaml" ]
- then
- PLUGINS_SHA1+=$(sha1sum ${plugin}packages.yaml)
- fi
- done
-
- if [ -n "${PLUGINS_SHA1}" ]
- then
- echo -n $PLUGINS_SHA1 | sha1sum
- fi
-}
-
-if [ -z "$CACHEBASE" ]; then
- errorexit "CACHEBASE not set - exiting..."
-fi
-
-case $1 in
- getbiweek)
- if [ $# -ne 1 ]; then
- errorexit "No arguments can be given to getbiweek!"
- fi
- getbiweek
- ;;
- getcommitid)
- if [ $# -ne 3 ]; then
- errorexit "Arg 1 needs to be URI and arg 2 tag/branch/commit"
- fi
- shift
- getcommitid $@
- ;;
- getid)
- if [ $# -ne 1 ]; then
- errorexit "No arguments can be given to getid!"
- fi
- getid
- ;;
- get|check|put)
- if [ $# -ne 2 ]; then
- errorexit "Only one argument, the SHA1 sum, can be given to getid!"
- else
- if ! validSHA1 $2; then
- errorexit "Invalid SHA1 format!"
- fi
- fi
-
- $1 $2
- exit $rc
- ;;
- packages)
- if [ $# -ne 1 ]; then
- errorexit "No arguments can be given to packages!"
- fi
- packages
- ;;
- *)
- errorexit "I only know about getcommitid, getid, check, get and put!"
-esac
diff --git a/build/check_dependencies.sh b/build/check_dependencies.sh
deleted file mode 100755
index cbcb98ab3..000000000
--- a/build/check_dependencies.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# Given a file as input, this script verifies that all URIs in the file can
-# be fetched.
-
-if [ $# -ne 1 ]; then
- echo "Usage: $(basename $0) <filename>"
- exit 1
-fi
-
-if [ ! -e $1 ]; then
- echo "Could not open $1"
- exit 1
-fi
-
-echo "Checking dependencies in $1"
-rc=0
-for uri in `cat $1`
-do
- if ! curl -sfr 0-100 $uri > /dev/null; then
- echo "Failed fetching $uri" >&2
- rc=1
- fi
-done
-
-if [ $rc -ne 0 ]; then
- echo "ERROR checking dependencies in $1"
-else
- echo "Dependencies OK"
-fi
-
-exit $rc
diff --git a/build/config.mk b/build/config.mk
deleted file mode 100644
index 5448c5eb4..000000000
--- a/build/config.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# This tag is NOT checked out, it only serves a cosmetic purpose of hinting
-# what upstream Fuel components our submodules are bound to (while tracking
-# remotes, ALL submodules will point to remote branch HEAD).
-# NOTE: Pinning fuel-main or other submodules to a specific commit/tag is
-# done ONLY via git submodules.
-FUEL_MAIN_TAG = master
-MOS_VERSION = 10.0
-OPENSTACK_VERSION = newton-10.0
-
-# List of space-separated Ubuntu architectures supported with current build
-# Format: same as `dpkg-architecture -qDEB_HOST_ARCH`
-# NOTE: Currently only amd64 is supported by Fuel@OPNFV. Armband adds arm64.
-export UBUNTU_ARCH ?= amd64
-
-##############################################################################
-# Fuel components pinning / remote tracking; use submodules from f_repos
-##############################################################################
-
-# git submodule & patch locations for Fuel components
-F_GIT_ROOT := $(shell git rev-parse --show-toplevel)
-F_GIT_DIR := $(shell git rev-parse --git-dir)
-F_SUBMOD_DIR := ${F_GIT_ROOT}/build/f_repos/sub
-F_PATCH_DIR := ${F_GIT_ROOT}/build/f_repos/patch
-F_OPNFV_TAG := ${FUEL_MAIN_TAG}-opnfv
-
-# fuel-main repo location used by main Makefile ISO building, use submodule
-FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main
-
-
-export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library
-export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web
-export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient
-export FUEL_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-agent
-export FUEL_NAILGUN_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-nailgun-agent
-export ASTUTE_REPO?=${F_SUBMOD_DIR}/fuel-astute
-export OSTF_REPO?=${F_SUBMOD_DIR}/fuel-ostf
-export FUELMENU_REPO?=${F_SUBMOD_DIR}/fuel-menu
-export SHOTGUN_REPO?=${F_SUBMOD_DIR}/shotgun
-export NETWORKCHECKER_REPO?=${F_SUBMOD_DIR}/network-checker
-export FUEL_UI_REPO?=${F_SUBMOD_DIR}/fuel-ui
-
-# OPNFV tags are automatically applied by `make -C f_repos patches-import`
-export FUELLIB_COMMIT?=${F_OPNFV_TAG}
-export NAILGUN_COMMIT?=${F_OPNFV_TAG}
-export PYTHON_FUELCLIENT_COMMIT?=${F_OPNFV_TAG}
-export FUEL_AGENT_COMMIT?=${F_OPNFV_TAG}
-export FUEL_NAILGUN_AGENT_COMMIT?=${F_OPNFV_TAG}
-export ASTUTE_COMMIT?=${F_OPNFV_TAG}
-export OSTF_COMMIT?=${F_OPNFV_TAG}
-export FUEL_MIRROR_COMMIT?=${F_OPNFV_TAG}
-export FUELMENU_COMMIT?=${F_OPNFV_TAG}
-export SHOTGUN_COMMIT?=${F_OPNFV_TAG}
-export NETWORKCHECKER_COMMIT?=${F_OPNFV_TAG}
-export FUELUPGRADE_COMMIT?=${F_OPNFV_TAG}
-export FUEL_UI_COMMIT?=${F_OPNFV_TAG}
-
-# for the patches applying purposes (empty git config in docker build container)
-export GIT_COMMITTER_NAME?=Fuel OPNFV
-export GIT_COMMITTER_EMAIL?=fuel@opnfv.org
-
-DOCKER_REPO := http://get.docker.com/builds/Linux/x86_64
-DOCKER_TAG := docker-latest
diff --git a/build/docker/.gitignore b/build/docker/.gitignore
deleted file mode 100644
index 2585910ce..000000000
--- a/build/docker/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.docker*
-ubuntu-builder/Dockerfile
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
deleted file mode 100644
index ce0c595d4..000000000
--- a/build/docker/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-FROM ubuntu:14.04
-ENV http_proxy INSERT_HTTP_PROXY
-ENV https_proxy INSERT_HTTPS_PROXY
-ENV no_proxy INSERT_NO_PROXY
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update
-RUN apt-get install -y software-properties-common python-software-properties \
- make python-setuptools python-all dpkg-dev debhelper ruby-json \
- fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
- ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full \
- build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev \
- syslinux
-
-RUN gem install fpm
-RUN pip install git+https://github.com/openstack/fuel-plugins
-# fuel-infra key
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BCE5CC461FA22B08
-
-RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
-RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies
-# Keeping PWD is needed to build as root
-RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
-# Keeping variables for ISO build
-RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH\"" > /etc/sudoers.d/keep-mos
-RUN chmod 0440 /etc/sudoers.d/open-sudo
-RUN chmod 0440 /etc/sudoers.d/keep-proxies
-RUN chmod 0440 /etc/sudoers.d/keep-pwd
-RUN chmod 0440 /etc/sudoers.d/keep-mos
-RUN chmod 4755 /bin/fusermount
-
-ADD ./setcontext /root/setcontext
-RUN chmod +x /root/setcontext
-
-VOLUME /var/lib/docker
diff --git a/build/docker/Makefile b/build/docker/Makefile
deleted file mode 100644
index cdf4a359c..000000000
--- a/build/docker/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-SHELL = /bin/bash
-FILES = $(wildcard ubuntu-builder/*) runcontext
-DOCKER_VER := $(shell [[ "$$(docker version --format '{{.Client.Version}}')" =~ ([0-9]+)\.([0-9]+) ]] && echo $$(( $${BASH_REMATCH[1]} * 100 + $${BASH_REMATCH[2]} )))
-
-# Builder tag lifespan, force container rebuild X days after tag creation
-DOCKER_KEEP = 1 days
-DOCKER_IMG = opnfv.org/ubuntu-builder
-DOCKER_TAG = ${DOCKER_IMG}:14.04
-# Shell contruct for checking our tag object did not expire
-DOCKER_EXPIRED = D_TAG_BIRTH=`docker inspect --format="{{.Created}}" \
- ${DOCKER_TAG} 2>/dev/null`; test -z "$$D_TAG_BIRTH" -o `date +%s` -gt \
- `date -d "$$D_TAG_BIRTH +${DOCKER_KEEP}" +%s`; echo $$?
-
-# Don't use -f flag when docker is newer than 1.9
-# https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag
-ifeq ($(shell echo "$(DOCKER_VER)>109" | bc), 1)
- tag_flags :=
-else
- tag_flags := -f
-endif
-
-.PHONY: all
-all: .docker
-
-.dockercfg: $(FILES)
- cp Dockerfile ubuntu-builder/Dockerfile
- # Only add proxy ENVs where set in host - needed to pull the base Ubuntu image
- test -n "${http_proxy}" && sed -i "s;INSERT_HTTP_PROXY;${http_proxy};" ubuntu-builder/Dockerfile || exit 0
- test -n "${https_proxy}" && sed -i "s;INSERT_HTTPS_PROXY;${https_proxy};" ubuntu-builder/Dockerfile || exit 0
- test -n "${no_proxy}" && sed -i "s;INSERT_NO_PROXY;${no_proxy};" ubuntu-builder/Dockerfile || exit 0
- test -n "${HTTP_PROXY}" && sed -i "s;INSERT_HTTP_PROXY;${HTTP_PROXY};" ubuntu-builder/Dockerfile || exit 0
- test -n "${HTTPS_PROXY}" && sed -i "s;INSERT_HTTPS_PROXY;${HTTPS_PROXY};" ubuntu-builder/Dockerfile || exit 0
- test -n "${NO_PROXY}" && sed -i "s;INSERT_NO_PROXY;${NO_PROXY};" ubuntu-builder/Dockerfile || exit 0
- sed -i '/INSERT_/d' ubuntu-builder/Dockerfile
- touch $@
-
-.docker: .dockercfg
- @if test -f .cacheid -o "$(shell ${DOCKER_EXPIRED})" -eq "0"; then \
- /usr/bin/docker build --rm=true --no-cache=true \
- -t ${DOCKER_TAG} ubuntu-builder && \
- /usr/bin/docker tag ${tag_flags} ${DOCKER_TAG} ${DOCKER_IMG}; \
- else \
- echo "Docker: Tag '${DOCKER_TAG}' was created less than" \
- "${DOCKER_KEEP} ago, skipping re-build."; \
- fi
- touch $@
- test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
-
-.PHONY: clean
-clean:
- rm -f .docker* ubuntu-builder/Dockerfile
-
-.PHONY: deepclean
-deepclean: clean clean-cache
-
-##############################################################################
-# Cache operations - only used when building through ci/build.sh
-##############################################################################
-
-# NOTE: For docker, we only get/put cache to fingerprint build scripts and
-# env vars, its cached data holds only an empty .docker file.
-
-# Create a unique hash to be used for getting and putting cache, based on:
-# - ubuntu-builder Dockerfile (includes eventual proxy env vars), runcontext;
-# - The contents of this Makefile
-.cacheid: .dockercfg
- sha1sum Makefile runcontext ubuntu-builder/* > .cachedata
- cat .cachedata | $(CACHETOOL) getid > .cacheid
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache:
- 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 \
- if test "$(shell ${DOCKER_EXPIRED})" -eq "0"; then \
- echo "Docker: Tag '${DOCKER_TAG}' missing" \
- "or older than ${DOCKER_KEEP}, not using it."; \
- else \
- touch .docker; \
- fi; \
- 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 - .docker | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/docker/README b/build/docker/README
deleted file mode 100644
index e5ccdfab6..000000000
--- a/build/docker/README
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-The makefile on this level is used for *creating* the Docker image
-used for building in Ubuntu 12.04 context.
-
-There are two requirements before running make on this level:
-
-1. You need to have Docker installed on your system
-
-2. If in a corporate network, make sure to have a valid DNS config in
- your /etc/default/docker, e.g:
-
- DOCKER_OPTS=" --dns=8.8.8.8 --dns=8.8.8.4"
-
-The top level makefile will refer to the "runcontext" file in order to
-run the build process as the current user with the current working
-directory available to the container.
diff --git a/build/docker/runcontext b/build/docker/runcontext
deleted file mode 100755
index b17571135..000000000
--- a/build/docker/runcontext
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-set -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-#
-
-############################################################################
-# BEGIN of Exit handlers
-#
-
-do_exit () {
- CID=`cat $CID_FILE </dev/null`
- rm -f $CID_FILE
- rm -rf $CONTEXT_DIR
- set +e
- docker kill $CID > /dev/null 2>&1
- docker rm -f $CID > /dev/null 2>&1
- docker rmi -f $IID > /dev/null 2>&1
- set -e
-}
-
-#
-# End of Exit handlers
-############################################################################
-
-trap do_exit SIGINT SIGTERM EXIT
-
-context=$1
-shift
-USER_ID=`id -u`
-USER=`whoami`
-GROUP_ID=`id -g`
-
-GITROOT=`git rev-parse --show-toplevel`
-CID_FILE=`mktemp -u -t runcontext.XXXXXXXXXX`
-CONTEXT_DIR=`mktemp -d ${GITROOT}/.docker_contextXXXXXX`
-
-# If RSYNC_CONNECT_PROG is used, we need to copy all of
-# the SSH structure, should one of the keys need to be
-# used.
-if [ -n "$RSYNC_CONNECT_PROG" -a -x $HOME/.ssh ]; then
- cp -rp $HOME/.ssh $CONTEXT_DIR
- rm -f $CONTEXT_DIR/.ssh/known_hosts
-else
- mkdir $CONTEXT_DIR/.ssh
-fi
-
-# Disable verification of unknown keys
-cat >> $CONTEXT_DIR/.ssh/config <<EOF
-StrictHostKeyChecking=no
-EOF
-
-cat > $CONTEXT_DIR/Dockerfile <<EOF
-FROM $context
-$(env | egrep -i 'proxy|rsync' | sed 's/^/ENV /' | sed 's/=/ /')
-RUN date || date
-COPY .ssh $HOME/.ssh
-RUN chown -R $USER_ID:$GROUP_ID $HOME/.ssh
-RUN chown -R $USER_ID:$GROUP_ID $HOME
-RUN chmod 700 $HOME/.ssh
-RUN /root/setcontext $USER $USER_ID $GROUP_ID $HOME
-EOF
-
-res=`docker build -q --force-rm $CONTEXT_DIR`
-IID=`echo $res | sed 's/.* //'`
-
-# Handle proxy settings passed to the context
-if env | grep -iq .*proxy; then
- envfile="$(readlink -f $(dirname $0)/..)/environment.mk"
-
- test -n "$HTTP_PROXY" && my_http_proxy=$HTTP_PROXY
- test -n "$http_proxy" && my_http_proxy=$http_proxy
-
- test -n "$HTTPS_PROXY" && my_https_proxy=$HTTPS_PROXY
- test -n "$https_proxy" && my_https_proxy=$https_proxy
-
- test -n "$NO_PROXY" && my_no_proxy=$NO_PROXY
- test -n "$no_proxy" && my_no_proxy=$no_proxy
-
- # Make sure to add the Docker socket in no_proxy
- if [ -n "$my_no_proxy" ]; then
- my_no_proxy+=",/var/run/docker.sock"
- else
- my_no_proxy="/var/run/docker.sock"
- fi
-
- echo "Creating $envfile"
- echo "# This file is automatically generated by runcontext, do not edit!" > $envfile
- test -n "$my_http_proxy" && echo "export http_proxy=$my_http_proxy" >> $envfile
- test -n "$my_https_proxy" && echo "export https_proxy=$my_https_proxy" >> $envfile
- test -n "$my_no_proxy" && echo "export no_proxy=$my_no_proxy" >> $envfile
- test -n "$RSYNC_PROXY" && echo "export RSYNC_PROXY=$RSYNC_PROXY" >> $envfile
- test -n "$RSYNC_CONNECT_PROG" && echo "export RSYNC_CONNECT_PROG=$RSYNC_CONNECT_PROG" >> $envfile
- echo "export npm_config_registry=http://registry.npmjs.org/" >> $envfile
-else
- echo "No need to generate environment.mk"
- rm -f $envfile
-fi
-
-# Evaluate the need for bind mounting the cache directory
-if [ -n "$CACHEBASE" ]; then
- if echo $CACHEBASE | grep -q '^file://'; then
- CACHEMOUNT="-v $(echo $CACHEBASE | sed 's;file://;;'):$(echo $CACHEBASE | sed 's;file://;;')"
- fi
-fi
-
-# FIXME: TERM is required because: https://github.com/docker/docker/issues/9299
-RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
- -e TERM=$TERM \
- -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
- -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
- -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
- -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \
- -u $USER_ID:$GROUP_ID -w $PWD \
- -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
-
-# Passing "debug" puts up an interactive bash shell
-if [ "$1" == "debug" ]; then
- echo command: docker run ${RUN_CONTEXT_OPT} $IID bash
- docker run -i -t ${RUN_CONTEXT_OPT} $IID bash
-else
- echo command: docker run ${RUN_CONTEXT_OPT} $IID $@
- docker run -t ${RUN_CONTEXT_OPT} $IID $@
-fi
-
diff --git a/build/docker/ubuntu-builder/install_docker.sh b/build/docker/ubuntu-builder/install_docker.sh
deleted file mode 100755
index 47c3a52ec..000000000
--- a/build/docker/ubuntu-builder/install_docker.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.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
-##############################################################################
-
-# From prepare-build-env.sh of Fuel
-# Check if docker is installed
-if hash docker 2>/dev/null; then
- echo "Docker binary found, checking if service is running..."
- ps cax | grep docker > /dev/null
- if [ $? -eq 0 ]; then
- echo "Docker is running."
- else
- echo "Process is not running, starting it..."
- sudo service docker start
- fi
-else
- # Install docker repository
- # Check that HTTPS transport is available to APT
- if [ ! -e /usr/lib/apt/methods/https ]; then
- sudo apt-get update
- sudo apt-get -y install -y apt-transport-https
- fi
- # Add the repository to APT sources
- echo deb http://mirror.yandex.ru/mirrors/docker/ docker main | sudo tee /etc/apt/sources.list.d/docker.list
- # Import the repository key
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
- # Install docker
- sudo apt-get update
- sudo apt-get -y install lxc-docker-1.7.1
-fi
diff --git a/build/docker/ubuntu-builder/setcontext b/build/docker/ubuntu-builder/setcontext
deleted file mode 100755
index bc28994a9..000000000
--- a/build/docker/ubuntu-builder/setcontext
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-#
-SETUSER=$1
-SETUID=$2
-SETGID=$3
-SETHOME=$4
-
-getent group $SETUSER || /usr/sbin/groupadd --gid $SETGID $SETUSER
-getent passwd $SETUSER || /usr/sbin/adduser --system --uid=$SETUID --gid=$SETGID --home $SETHOME --shell /bin/bash $SETUSER
-/usr/sbin/usermod -a -G fuse $SETUSER
-exit 0
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
deleted file mode 100644
index 0e203bbba..000000000
--- a/build/f_isoroot/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# Add Fuel plugin build targets here
-PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_tacker-pluginbuild f_onosfwpluginbuild
-export PLUGINS
-
-
-# If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
-# indicated therein.
-ifdef BUILD_FUEL_PLUGINS
-export BUILD_FUEL_PLUGINS
-SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
-$(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
-else
-SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS)
-endif
-SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
-
-.PHONY: all
-all: $(SUBDIRS)
-
-.PHONY: $(SUBDIRS)
-$(SUBDIRS):
- @mkdir -p release
- $(MAKE) -C $@ -f Makefile release
-
-.PHONY: clean $(SUBCLEAN)
-clean: $(SUBCLEAN)
- @rm -Rf release
-
-$(SUBCLEAN): %.clean:
- $(MAKE) -C $* -f Makefile clean
-
-.PHONY: release
-release: $(SUBDIRS)
- @cp -Rvp release/* ../release/isoroot
-
-include cache.mk
diff --git a/build/f_isoroot/README b/build/f_isoroot/README
deleted file mode 100644
index eb54c0827..000000000
--- a/build/f_isoroot/README
+++ /dev/null
@@ -1,16 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This is to (a) replace/patch existing Fuel ISO files as well
-as adding new information directly into the ISO structure
-
-Please separate changes into "patches" and new content into
-"additions". Both directories will be anchored at the ISO file
-root.
diff --git a/build/f_isoroot/cache.mk b/build/f_isoroot/cache.mk
deleted file mode 100644
index 2df3b6bd1..000000000
--- a/build/f_isoroot/cache.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################################################
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#
-# This file is only meant for a top Makefile which is only calling its
-# own SUBDIRS, without building any cachable artifact by itself.
-#############################################################################
-
-# Call sub caches
-SUBGETCACHE = $(addsuffix .getcache,$(SUBDIRS))
-$(SUBGETCACHE): %.getcache:
- $(MAKE) -C $* -f Makefile get-cache
-
-SUBPUTCACHE = $(addsuffix .putcache,$(SUBDIRS))
-$(SUBPUTCACHE): %.putcache:
- $(MAKE) -C $* -f Makefile put-cache
-
-SUBCLEANCACHE = $(addsuffix .cleancache,$(SUBDIRS))
-$(SUBCLEANCACHE): %.cleancache:
- $(MAKE) -C $* -f Makefile clean-cache
-
-.PHONY: get-cache
-get-cache: $(SUBGETCACHE)
-
-.PHONY: put-cache
-put-cache: $(SUBPUTCACHE)
-
-.PHONY: clean-cache
-clean-cache: $(SUBCLEANCACHE)
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
deleted file mode 100644
index a236b63b4..000000000
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@ericsson.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: .bgpvpnbuild
-
-.PHONY: clean
-clean:
- @rm -f .bgpvpnbuild ../release/opnfv/bgpvpn*.rpm bgpvpn*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_bgpvpnplugin.txt gitinfo_bgpvpnplugin.txt
-
-.PHONY: release
-release:.bgpvpnbuild
- @rm -f ../release/opnfv/bgpvpn*.rpm
- @mkdir -p ../release/bgpvpn
- @cp bgpvpn*.rpm ../release/opnfv/
- cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE)
-
-.bgpvpnbuild:
- # The python packages build into deb by this plugin require a newer
- # setuptools install a newer setuptools version until the container
- # where this is run is bumped to ubuntu 16.04.
- # --user is used because there is already a setuptools installation
- # managed by apt.
- pip install setuptools --upgrade --user
- rm -rf fuel-plugin-bgpvpn
- git clone $(BGPVPN_REPO)
- cd fuel-plugin-bgpvpn; \
- git checkout $(BGPVPN_BRANCH); \
- if [ ! -z $(BGPVPN_CHANGE) ]; then \
- git fetch $(BGPVPN_REPO) $(BGPVPN_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- fpb --debug --build fuel-plugin-bgpvpn/
- mv fuel-plugin-bgpvpn/bgpvpn*.rpm .
- $(REPOINFO) -r . > gitinfo_bgpvpnplugin.txt
- rm -rf fuel-plugin-bgpvpn
- touch .bgpvpnbuild
- # 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 $(BGPVPN_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(BGPVPN_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_BRANCH) > .cachedata; \
- fi
- sha1sum Makefile >> .cachedata
- sha1sum config.mk >> .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 - .bgpvpnbuild bgpvpn*.rpm gitinfo_bgpvpnplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
deleted file mode 100644
index cd005e82f..000000000
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-BGPVPN_BRANCH?=master
-BGPVPN_REPO?="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE?=cdf0ee0f60e417f37810d6c0074cd1eed4701bf5
diff --git a/build/f_isoroot/f_bootstrap/Makefile b/build/f_isoroot/f_bootstrap/Makefile
deleted file mode 100644
index 1c08405ab..000000000
--- a/build/f_isoroot/f_bootstrap/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all:
- @mkdir -p release/opnfv/bootstrap/pre.d
- @mkdir -p release/opnfv/bootstrap/post.d
- @mkdir -p release/usr/local/sbin
- @cp pre-scripts/* release/opnfv/bootstrap/pre.d
- @cp post-scripts/* release/opnfv/bootstrap/post.d
-
-.PHONY: clean
-clean:
- @rm -rf release
-
-.PHONY: release
-release:all
- @cp -Rvp release/* ../release
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
- @echo "clean-cache not implemented"
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache:
- @echo "get-cache not implemented"
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache:
- @echo "put-cache not implemented"
diff --git a/build/f_isoroot/f_bootstrap/README b/build/f_isoroot/f_bootstrap/README
deleted file mode 100644
index 5da954ca4..000000000
--- a/build/f_isoroot/f_bootstrap/README
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This function modifies the adds hooks to the beginning and end of
-/usr/local/sbin/bootstrap_admin_nodes.sh, which is run as the
-last post step from ks.cfg
-
-This enables other functions to place scripts into two directories
-run either at the beginning or the end of the bootstrap procedure:
-
- /opt/opnfv/bootstrap/pre.d
- /opt/opnfv/bootstrap/post.d
-
-These will be run in lexical order at pre or post.
-
-CI note: Using pre.d, it would be possible to "inject" a pre-defined
-astute.yaml for Fuel.
diff --git a/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh b/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh
deleted file mode 100755
index 4dfeca58e..000000000
--- a/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/sh
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-date
-echo "This is an example file run at post-bootstrap."
-exit 0
diff --git a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh
deleted file mode 100755
index 431577cba..000000000
--- a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#/bin/sh
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-echo "Installing pre-build repo"
-if [ ! -d /opt/opnfv/nailgun ]; then
- echo "Error - found no repo!"
- exit 1
-fi
-
-mkdir -p /var/www/nailgun
-mv /opt/opnfv/nailgun/* /var/www/nailgun
-if [ $? -ne 0 ]; then
- echo "Error moving repos to their correct location!"
- exit 1
-fi
-rmdir /opt/opnfv/nailgun
-if [ $? -ne 0 ]; then
- echo "Error removing /opt/opnfv/nailgun directory!"
- exit 1
-fi
-echo "Done installing pre-build repo"
diff --git a/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh b/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh
deleted file mode 100755
index 3eaffa523..000000000
--- a/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/sh
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-date
-echo "This is an example file run at pre-bootstrap."
-exit 0
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
deleted file mode 100644
index bb4b19cc8..000000000
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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: .barometer
-
-.PHONY: clean
-clean:
- @rm -f .barometer ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm fuel-plugin-collectd-ceilometer-*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_collectd-ceilometer-plugin.txt gitinfo_collectd-ceilometer-plugin.txt
-
-.PHONY: release
-release:.barometer
- @rm -f ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-collectd-ceilometer*.rpm ../release/opnfv/
- cp gitinfo_collectd-ceilometer-plugin.txt $(BUILD_BASE)
-
-.barometer:
- @rm -rf barometer
- ../../docker/ubuntu-builder/install_docker.sh
- git clone $(COLLECTD_CEILOMETER_REPO)
- cd barometer; \
- git checkout $(COLLECTD_CEILOMETER_BRANCH); \
- if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
- git fetch $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- fpb --debug --build barometer/src/fuel-plugin
- @mv barometer/src/fuel-plugin/fuel-plugin-collectd-ceilometer*.rpm .
- $(REPOINFO) -r . > gitinfo_collectd-ceilometer-plugin.txt
- @rm -rf barometer
- @touch .barometer
- # 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 $(COLLECTD_CEILOMETER_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_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 - .barometer fuel-plugin-collectd-ceilometer*.rpm gitinfo_collectd-ceilometer-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
deleted file mode 100644
index 334905f02..000000000
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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
-##############################################################################
-
-COLLECTD_CEILOMETER_BRANCH?=stable/danube
-COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/barometer
-COLLECTD_CEILOMETER_CHANGE?=5649793d2037d6f26211be4035e28842ebb3e737
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
deleted file mode 100644
index 1ba7201f4..000000000
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 OPNFV.
-# 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
-##############################################################################
-packages:
- - "collectd"
diff --git a/build/f_isoroot/f_congress-pluginbuild/Makefile b/build/f_isoroot/f_congress-pluginbuild/Makefile
deleted file mode 100644
index 51167acd9..000000000
--- a/build/f_isoroot/f_congress-pluginbuild/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis Inc and others.
-# fzhadaev@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
-##############################################################################
-
-TOP := $(shell pwd)
-
-############################################################################
-# BEGIN of Include definitions
-#
-include config.mk
-#
-# END Include definitions
-#############################################################################
-
-
-.PHONY: all
-all: .congressbuild
-
-.PHONY: clean
-clean:
- @rm -f .congressbuild ../release/opnfv/congress*.rpm congress*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_congressplugin.txt gitinfo_congressplugin.txt
-
-.PHONY: release
-release:.congressbuild
- @rm -f ../release/opnfv/congress*.rpm
- @mkdir -p ../release/congress
- @cp congress*.rpm ../release/opnfv/
- cp gitinfo_congressplugin.txt $(BUILD_BASE)
-
-.congressbuild:
- rm -rf fuel-plugin-congress
- git clone $(CONGRESS_REPO)
- cd fuel-plugin-congress; \
- git checkout $(CONGRESS_BRANCH); \
- if [ ! -z $(CONGRESS_CHANGE) ]; then \
- git fetch $(CONGRESS_REPO) $(CONGRESS_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- fpb --debug --build fuel-plugin-congress/
- @mv fuel-plugin-congress/congress*.rpm .
- $(REPOINFO) -r . > gitinfo_congressplugin.txt
- @rm -rf fuel-plugin-congress
- @touch .congressbuild
- # 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 $(CONGRESS_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(CONGRESS_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(CONGRESS_REPO) $(CONGRESS_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(CONGRESS_REPO) $(CONGRESS_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 - .congressbuild congress*.rpm gitinfo_congressplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_congress-pluginbuild/config.mk b/build/f_isoroot/f_congress-pluginbuild/config.mk
deleted file mode 100644
index 5c241a127..000000000
--- a/build/f_isoroot/f_congress-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis Inc and others.
-# fzhadaev@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
-##############################################################################
-
-CONGRESS_BRANCH?=master
-CONGRESS_REPO?="https://github.com/openstack/fuel-plugin-congress"
-CONGRESS_CHANGE?=adfa2db62988649219d64bd53746f2635d95aa43
diff --git a/build/f_isoroot/f_isolinux/Makefile b/build/f_isoroot/f_isolinux/Makefile
deleted file mode 100644
index f3e09b234..000000000
--- a/build/f_isoroot/f_isolinux/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all: isolinux.cfg.iso
- @mkdir -p release/isolinux
- grep -q OpenStack_Fuel isolinux.cfg.iso
- sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" isolinux.cfg.iso > isolinux.cfg
- @cp isolinux.cfg release/isolinux/isolinux.cfg
- @cp isolinux.cfg.iso release/isolinux/isolinux.cfg.orig
-
-isolinux.cfg.iso:
- 7z -so x $(ISOCACHE) isolinux/isolinux.cfg > isolinux.cfg.iso
-
-.PHONY: clean
-clean:
- @rm -rf release isolinux.cfg.iso isolinux.cfg
-
-.PHONY: release
-release: all
- @cp -Rvp release/* ../release
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
- @echo "clean-cache not implemented"
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache:
- @echo "get-cache not implemented"
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache:
- @echo "put-cache not implemented"
diff --git a/build/f_isoroot/f_kscfg/Makefile b/build/f_isoroot/f_kscfg/Makefile
deleted file mode 100644
index cfd433f8d..000000000
--- a/build/f_isoroot/f_kscfg/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all: ks.cfg.iso
- @mkdir -p release
- grep -q OpenStack_Fuel ks.cfg.iso
- sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" ks.cfg.iso > ks.cfg
- /usr/bin/patch -p0 < ks.cfg.patch
- @cp ks.cfg.iso release/ks.cfg.orig
- @cp ks.cfg release/ks.cfg
-
-ks.cfg.iso:
- 7z -so x $(ISOCACHE) ks.cfg > ks.cfg.iso
-
-.PHONY: clean
-clean:
- @rm -rf release ks.cfg.iso ks.cfg
-
-.PHONY: release
-release: all
- @cp -Rvp release/* ../release
-
-#############################################################################
-# Cache operations - only used when building through ci/build.sh
-#############################################################################
-
-# Clean local data related to caching - called prior to ordinary build
-.PHONY: clean-cache
-clean-cache: clean
- @echo "clean-cache not implemented"
-
-# Try to download cache - called prior to ordinary build
-.PHONY: get-cache
-get-cache:
- @echo "get-cache not implemented"
-
-# Store cache if not already stored - called after ordinary build
-.PHONY: put-cache
-put-cache:
- @echo "put-cache not implemented"
diff --git a/build/f_isoroot/f_kscfg/README b/build/f_isoroot/f_kscfg/README
deleted file mode 100644
index c85efde77..000000000
--- a/build/f_isoroot/f_kscfg/README
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-This function modifies the ks.cfg of the Fuel master to
-make copy whatever is in the top level opnfv directory
-of the ISO (populated by, for example, f_configfrontend) to
-/opt/opnfv. In the end this is where the installation
-parts will evolve.
-
-This is also the place to force the installation to overwrite
-the disk (set forceformat="yes" instead of "no").
diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch
deleted file mode 100644
index a6840e479..000000000
--- a/build/f_isoroot/f_kscfg/ks.cfg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-*** /dev/null 2016-04-26 10:10:11.481587709 +0200
---- ks.cfg 2016-04-26 10:10:11.481587709 +0200
-***************
-*** 579,584 ****
---- 579,592 ----
-
- EOF
-
-+ ######### OPNFV addition BEGIN ############
-+ # Copy data into /opt/opnfv
-+ # TODO: This ought to be a package instead!
-+ mkdir -p /opt/opnfv
-+ cp -r ${SOURCE}/opnfv /opt
-+ cp ${SOURCE}/gitinfo.txt /
-+ ######### OPNFV addition END ############
-+
- # Unmounting source
- umount -f ${SOURCE}
- rm -rf ${SOURCE}
-***************
-*** 647,650 ****
- /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \
- /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif}
- fi
-! %end
-\ No newline at end of file
---- 655,658 ----
- /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \
- /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif}
- fi
-! %end
diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
deleted file mode 100644
index 81309ef87..000000000
--- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .kvmbuild
-
-.PHONY: clean
-clean:
- @rm -f .kvmbuild ../release/opnfv/fuel-plugin-kvm*.rpm fuel-plugin-kvm*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_kvm-plugin.txt gitinfo_kvm-plugin.txt
-
-.PHONY: release
-release:.kvmbuild
- @rm -f ../release/opnfv/fuel-plugin-kvm*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-kvm*.rpm ../release/opnfv/
- cp gitinfo_kvm-plugin.txt $(BUILD_BASE)
-
-.kvmbuild:
- @rm -rf kvmfornfv
- ../../docker/ubuntu-builder/install_docker.sh
- git clone $(KVMFORNFV_REPO)
- cd kvmfornfv; \
- git checkout $(KVMFORNFV_BRANCH); \
- if [ ! -z $(KVMFORNFV_CHANGE) ]; then \
- git fetch $(KVMFORNFV_REPO) $(KVMFORNFV_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- cd kvmfornfv/fuel-plugin; \
- INCLUDE_DEPENDENCIES=true fpb --debug --build ./
- @mv kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm .
- $(REPOINFO) -r . > gitinfo_kvm-plugin.txt
- @rm -rf kvmfornfv
- @touch .kvmbuild
- # 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 $(KVMFORNFV_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(KVMFORNFV_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(KVMFORNFV_REPO) $(KVMFORNFV_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(KVMFORNFV_REPO) $(KVMFORNFV_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 - .kvmbuild fuel-plugin-kvm*.rpm gitinfo_kvm-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
deleted file mode 100644
index 19693df25..000000000
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-KVMFORNFV_BRANCH?=master
-KVMFORNFV_REPO?=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE?=b6b08d2a80b2df28e496ce87705593ed59b282a3
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
deleted file mode 100644
index c0ebba4d7..000000000
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 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
-##############################################################################
-
-TOP := $(shell pwd)
-
-include config.mk
-
-.PHONY: all
-all: .odlbuild
-
-.PHONY: clean
-clean:
- @rm -f .odlbuild ../release/opnfv/opendaylight*.rpm opendaylight*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_odlplugin.txt gitinfo_odlplugin.txt
- @rm -rf fuel-plugins
-
-.PHONY: release
-release:.odlbuild
- @rm -f ../release/opnfv/opendaylight*.rpm
- @mkdir -p ../release/opnfv
- @cp opendaylight*.rpm ../release/opnfv/
- cp gitinfo_odlplugin.txt $(BUILD_BASE)
-.odlbuild:
- rm -rf fuel-plugin-opendaylight
- ../../docker/ubuntu-builder/install_docker.sh
- git clone -b $(FUEL_PLUGIN_ODL_BRANCH) $(FUEL_PLUGIN_ODL_REPO)
- cd fuel-plugin-opendaylight; \
- if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
- git checkout $(FUEL_PLUGIN_ODL_CHANGE); \
- fi
- fpb --debug --build fuel-plugin-opendaylight/
- mv fuel-plugin-opendaylight/opendaylight*.rpm .
- $(REPOINFO) -r . > gitinfo_odlplugin.txt
- rm -rf fuel-plugin-opendaylight
- touch .odlbuild
- # 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 $(FUEL_PLUGIN_ODL_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(FUEL_PLUGIN_ODL_REPO) $(FUEL_PLUGIN_ODL_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(FUEL_PLUGIN_ODL_REPO) $(FUEL_PLUGIN_ODL_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 - .odlbuild opendaylight*.rpm gitinfo_odlplugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
deleted file mode 100644
index 6d176fb75..000000000
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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_PLUGIN_ODL_BRANCH ?= master
-FUEL_PLUGIN_ODL_CHANGE ?= 32b7edbde866b6a4c1c61e674ddf01a93dd010a2
-FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
-
-export OPNFV_BUILD?=true
-export ODL_VERSIONS?=5.0.0.1 5.2.0.1
diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
deleted file mode 100644
index 02ba02951..000000000
--- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .onosbuild
-
-.PHONY: clean
-clean:
- @rm -f .onosbuild ../release/opnfv/onos*.rpm onos*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_onos-plugin.txt gitinfo_onos-plugin.txt
-
-.PHONY: release
-release:.onosbuild
- @rm -f ../release/opnfv/onos*.rpm
- @mkdir -p ../release/opnfv
- @cp onos*.rpm ../release/opnfv/
- cp gitinfo_onos-plugin.txt $(BUILD_BASE)
-
-.onosbuild:
- @rm -rf fuel-plugin-onos
- git clone $(ONOS_REPO)
- cd fuel-plugin-onos; \
- git checkout $(ONOS_BRANCH); \
- if [ ! -z $(ONOS_CHANGE) ]; then \
- git fetch $(ONOS_REPO) $(ONOS_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-onos/
- @mv fuel-plugin-onos/onos*.rpm .
- $(REPOINFO) -r . > gitinfo_onos-plugin.txt
- @rm -rf fuel-plugin-onos
- @touch .onosbuild
- # 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 $(ONOS_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(ONOS_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(ONOS_REPO) $(ONOS_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(ONOS_REPO) $(ONOS_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 - .onosbuild onos*.rpm gitinfo_onos-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk
deleted file mode 100644
index 5f47804cd..000000000
--- a/build/f_isoroot/f_onosfwpluginbuild/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-ONOS_BRANCH=master
-ONOS_REPO=git://git.openstack.org/openstack/fuel-plugin-onos
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
deleted file mode 100644
index 2d0d202af..000000000
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .ovsbuild
-
-.PHONY: clean
-clean:
- @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs-*.rpm fuel-plugin-ovs-*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt
-
-.PHONY: release
-release:.ovsbuild
- @rm -f ../release/opnfv/fuel-plugin-ovs-*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-ovs*.rpm ../release/opnfv/
- cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
-
-.ovsbuild:
- @rm -rf fuel-plugin-ovs
- ../../docker/ubuntu-builder/install_docker.sh
- git clone $(OVS_NSH_DPDK_REPO)
- cd fuel-plugin-ovs; \
- git checkout $(OVS_NSH_DPDK_BRANCH); \
- if [ ! -z $(OVS_NSH_DPDK_CHANGE) ]; then \
- git fetch $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovs/
- @mv fuel-plugin-ovs/fuel-plugin-ovs*.rpm .
- $(REPOINFO) -r . > gitinfo_ovs-nsh-dpdk-plugin.txt
- @rm -rf fuel-plugin-ovs
- @touch .ovsbuild
- # 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 $(OVS_NSH_DPDK_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(OVS_NSH_DPDK_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_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 - .ovsbuild fuel-plugin-ovs*.rpm gitinfo_ovs-nsh-dpdk-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
deleted file mode 100644
index 9de705aae..000000000
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-OVS_NSH_DPDK_BRANCH?=stable/10.0
-OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
-OVS_NSH_DPDK_CHANGE?=a77ce892047fe1ca257bd199d0abf2d2a046c8a3
diff --git a/build/f_isoroot/f_repobuild/.gitignore b/build/f_isoroot/f_repobuild/.gitignore
deleted file mode 100644
index 09baca85d..000000000
--- a/build/f_isoroot/f_repobuild/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-packetary
-fuel-web
-nailgun
-opnfv_config
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
deleted file mode 100644
index c61d1adf5..000000000
--- a/build/f_isoroot/f_repobuild/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB, Enea AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-SHELL := /bin/bash
-TOP := $(shell pwd)
-
-include ../../config.mk
-include config.mk
-
-export MOS_VERSION
-export MIRROR_UBUNTU_OPNFV_PATH:=$(TOP)/nailgun/mirrors/ubuntu
-
-.PHONY: all
-all: nailgun
-
-nailgun:
- sudo apt-get install -y createrepo git libxml2-dev libxslt1-dev \
- python-dev zlib1g-dev
- rm -Rf nailgun packetary opnfv_config && mkdir opnfv_config
- # We will analyze fuel-web's fixture files for package lists
- ln -sf ${F_SUBMOD_DIR}/fuel-web fuel-web
- # Same for fuel-agent's bootstrap package list
- ln -sf ${F_SUBMOD_DIR}/fuel-agent fuel-agent
- git clone --quiet $(PACKETARY_REPO)
- if [ -n $(PACKETARY_COMMIT) ]; then \
- git -C packetary checkout $(PACKETARY_COMMIT); \
- fi
- sudo pip install -U -r ./packetary/requirements.txt
- sudo pip install -U ./packetary
- # Handle config and mirror build in one place
- ./opnfv_mirror_ubuntu.py
- # 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
-
-.PHONY: clean
-clean:
- @rm -rf ../release/opnfv/nailgun nailgun packetary fuel-web opnfv_config
-
-.PHONY: release
-release:nailgun
- @rm -Rf ../release/opnfv/nailgun
- @mkdir -p ../release/opnfv
- @cp -Rp nailgun ../release/opnfv/nailgun
-
-############################################################################
-# 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)
-# - The contents of this Makefile + all sh,mk,py,yaml files in CWD
-# - repo packages fingerprint
-# - repo arch list
-.cacheid:
- date +"Repocache %G%V" > .cachedata
- sha1sum Makefile *.{sh,mk,py,yaml} >> .cachedata
- $(CACHETOOL) packages >> .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 - nailgun | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_repobuild/config.mk b/build/f_isoroot/f_repobuild/config.mk
deleted file mode 100644
index 68101d6ec..000000000
--- a/build/f_isoroot/f_repobuild/config.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Ericsson AB, Enea AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-# Use a recent master commit, since tags/branches are not yet mature
-export PACKETARY_REPO?=https://github.com/openstack/packetary
-export PACKETARY_COMMIT?=c3c2069e2ec46b35eb342386efbf366bb6340027
-
-# arm64 Ubuntu mirror is separated from archive.ubuntu.com
-export MIRROR_UBUNTU_URL_arm64=http://ports.ubuntu.com/ubuntu-ports/
-export MIRROR_UBUNTU_ROOT_arm64=ubuntu-ports
-
-# Merge all local mirror repo components/section into single "main"
-# NOTE: When changing this, make sure to also update all consumer config, like:
-# - fuel-menu/fuelmenu/settings.yaml
-export MIRROR_UBUNTU_MERGE=true
diff --git a/build/f_isoroot/f_repobuild/opnfv_config.yaml b/build/f_isoroot/f_repobuild/opnfv_config.yaml
deleted file mode 100644
index bf3913cc4..000000000
--- a/build/f_isoroot/f_repobuild/opnfv_config.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Enea AB and others.
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-# REPO definitions
-
-# Based on old fuel-mirror data [1], adapted for OPNFV and packetary.
-# NOTE: 'uri' field will be added by opnfv_mirror_ubuntu.py from ENV.
-# [1] https://github.com/openstack/fuel-mirror/blob/stable/mitaka/
-# contrib/fuel_mirror/data/ubuntu.yaml
-
-# Main is a required parameter which defines what repository will be used
-# for images creation and that mirror should contain all packages for minimal
-# system creation.
-groups:
- ubuntu:
- - name: "ubuntu"
- main: true
- suite: "xenial"
- section:
- - "main"
- - "multiverse"
- - "restricted"
- - "universe"
- type: "deb"
- priority: null
-
- - name: "ubuntu-updates"
- suite: "xenial-updates"
- section:
- - "main"
- - "multiverse"
- - "restricted"
- - "universe"
- type: "deb"
- priority: null
-
- - name: "ubuntu-security"
- suite: "xenial-security"
- section:
- - "main"
- - "multiverse"
- - "restricted"
- - "universe"
- type: "deb"
- priority: null
-
- mos:
- - name: "mos"
- suite: "mos$mos_version"
- section:
- - "main"
- - "restricted"
- type: "deb"
- priority: 1000
-
- - name: "mos-updates"
- suite: "mos$mos_version-updates"
- section:
- - "main"
- - "restricted"
- type: "deb"
- priority: 1000
-
- - name: "mos-security"
- suite: "mos$mos_version-security"
- section:
- - "main"
- - "restricted"
- type: "deb"
- priority: 1000
-
- - name: "mos-holdback"
- suite: "mos$mos_version-holdback"
- section:
- - "main"
- - "restricted"
- type: "deb"
- priority: 1000
-
-# PACKAGES
-
-# This section lists packages that should be present in the local Ubuntu mirror,
-# but are not direct dependencies of any other packages from MOS or Ubuntu.
-# e.g.: additional kernels, bootloaders etc.
-
-packages:
- - name: "vgabios"
-# Packages are required to build bootstrap images for a system.
-# The mirror should contiain such packages in addition to local mirror.
- - name: "acpi-support"
- - name: "anacron"
- - name: "aptitude"
- - name: "atop"
- - name: "acct"
- - name: "bash-completion"
- - name: "bc"
- - name: "build-essential"
- - name: "ceph"
- - name: "cloud-init"
- - name: "conntrackd"
- - name: "cpu-checker"
- - name: "cpufrequtils"
- - name: "debconf-utils"
- - name: "devscripts"
- - name: "fping"
- - name: "galera-3"
- - name: "git"
- - name: "grub-pc"
- - name: "htop"
- - name: "hwloc"
- - name: "ifenslave"
- - name: "iperf"
- - name: "iptables-persistent"
- - name: "irqbalance"
- - name: "language-pack-en"
- - name: "libapache2-mod-fastcgi"
- - name: "libnss3-tools"
- - name: "linux-headers-generic-lts-xenial"
- - name: "linux-image-generic-lts-xenial"
- - name: "live-boot"
- - name: "livecd-rootfs"
- - name: "mc"
- - name: "memcached"
- - name: "mongodb-server"
- - name: "monit"
- - name: "msmtp-mta"
- - name: "multipath-tools"
- - name: "multipath-tools-boot"
- - name: "nginx"
- - name: "ntp"
- - name: "openssh-server"
- - name: "pcs"
- - name: "percona-toolkit"
- - name: "percona-xtrabackup"
- - name: "pm-utils"
- - name: "postfix"
- - name: "puppet"
- - name: "python-lesscpy"
- - name: "python-mysqldb"
- - name: "python-pip"
- - name: "radosgw"
- - name: "rbd-fuse"
- - name: "rsyslog-gnutls"
- - name: "rsyslog-relp"
- - name: "screen"
- - name: "squashfs-tools"
- - name: "swift-plugin-s3"
- - name: "sysfsutils"
- - name: "sysstat"
- - name: "telnet"
- - name: "tmux"
- - name: "traceroute"
- - name: "ubuntu-standard"
- - name: "vim"
- - name: "virt-what"
- - name: "xinetd"
- - name: "xmlstarlet"
- - name: "tftpd-hpa"
- - name: "syslinux"
-
-# OPNFV BLACKLIST
-
-# Packetary's dependency solving mechanism brings in more than one alternative
-# For example, "Depends: upstart | systemd-sysv" brings both packages, which
-# leads to debootstrap using "upstart" (1st option available in local repo).
-
-opnfv_blacklist:
- - name: "upstart"
diff --git a/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py b/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py
deleted file mode 100755
index 7c383639e..000000000
--- a/build/f_isoroot/f_repobuild/opnfv_mirror_ubuntu.py
+++ /dev/null
@@ -1,280 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB, Mirantis Inc., Enea AB and others.
-# mskalski@mirantis.com
-# Alexandru.Avadanii@enea.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
-##############################################################################
-
-"""Build multiarch partial local Ubuntu mirror using packetary"""
-
-##############################################################################
-# Design quirks / workarounds:
-# 1. Fuel-agent uses `debootstrap` to build bootstrap and target chroots from
-# the local mirror; which only uses the "main" component from the first
-# repository, i.e. does not include "updates"/"security".
-# In order to fullfill all debootstrap dependencies in "main" repo, we will
-# do an extra packetary run using a reduced scope:
-# - only "main" component of the first mirror;
-# - reduced package dependency list (without MOS/OPNFV plugin deps).
-# 2. If repo structure is not mandatory to be in sync with official mirrors,
-# we can mitigate the issue by "merging" all repo-components into a single
-# "main".
-##############################################################################
-# Mirror build steps (for EACH architecture in UBUNTU_ARCH):
-# 1. Collect bootstrap package deps from fuel-agent's <settings.yaml.sample>;
-# 2. Collect all fixture release packages from fuel-web's <openstack.yaml>;
-# 3. Parse new "opnfv_config.yaml" list of packages (from old fuel-mirror);
-# 4. Inherit enviroment variable(s) for mirror URLs, paths etc.
-# - Allow arch-specific overrides for each env var;
-# 5. Mirror config is defined based on common config + OPNFV overrides;
-# - Convert old configuration format to packetary style where needed;
-# 6. Package lists are defined based on common config + OPNFV deps;
-# - Keep track of "main" packages separately, required by debootstrap;
-# 7. Clone/update all mirror components;
-# 8. IF mirror merging is disabled:
-# - Clone/update "main" mirror component (fix missing debootstrap deps);
-# 9. IF mirror merging is enabled:
-# - Use `dpkg-scanpackages` to filter out old versions of duplicate pkgs;
-# - Run `packetary create` on the set of downloaded packages, merging
-# them on the fly into a single-component mirror;
-##############################################################################
-
-from copy import deepcopy
-import os
-import shutil
-import sys
-import yaml
-from contextlib import contextmanager
-from cStringIO import StringIO
-from packetary.cli.app import main
-
-@contextmanager
-def capture_stdout(output):
- """Context manager for capturing stdout"""
- stdout = sys.stdout
- sys.stdout = output
- yield
- sys.stdout = stdout
-
-# FIXME: Find a better approach for eliminating duplicate logs than this
-def force_logger_reload():
- """Force logger reload (ugly hack to prevent log duplication)"""
- for mod in sys.modules.keys():
- if mod.startswith('logging'):
- try:
- reload(sys.modules[mod])
- except:
- pass
-
-def get_unres_pkgs(architecture, cfg_mirror):
- """Determine missing package dependecies for a mirror defition"""
- unresolved_pkgs = list()
- packetary_output = StringIO()
- with capture_stdout(packetary_output):
- main('unresolved -a {0} -r {1} -c name version --sep ;'
- .format(_ARCH[architecture], cfg_mirror).split(' '))
- for dep_pkg in packetary_output.getvalue().splitlines():
- if dep_pkg.startswith('#'):
- continue
- dep = dep_pkg.split(';')
- unresolved_pkgs += [{'name': dep[0], 'version': dep[1]}]
- force_logger_reload()
- return unresolved_pkgs
-
-def from_legacy_pkglist(legacy_pkglist):
- """Package list conversion from `old fuel-mirror` to `packetary` style"""
- pkglist = list()
- for pkg in legacy_pkglist:
- pkglist += [{'name': pkg}]
- return pkglist
-
-def to_legacy_pkglist(pkglist):
- """Package list conversion from `packetary` style to `old fuel-mirror`"""
- legacy_pkglist = list()
- for pkg in pkglist:
- legacy_pkglist.append(pkg['name'])
- return legacy_pkglist
-
-def legacy_diff(base_pkglist, new_pkglist, requester, architecture):
- """Package list diff (old format)"""
- diff_set = set(new_pkglist)
- if base_pkglist:
- diff_set -= set(base_pkglist)
- if diff_set:
- print(' * {0} requires new packages for architecture [{1}]: {2}'
- .format(requester, architecture, ', '.join(diff_set)))
- return list(diff_set)
-
-def do_local_repo(architecture, cfg_repo, cfg_packages_paths):
- """Create single-component local repo (one architecture per call)"""
- # Packetary does not use a global config file, so pass old settings here.
- main('create -t deb -a {0} --repository {1} --package-files {2}'
- ' --ignore-errors-num 2 --retries-num 3 --threads-num 10'
- .format(_ARCH[architecture], cfg_repo, cfg_packages_paths).split(' '))
- force_logger_reload()
-
-def do_partial_mirror(architecture, cfg_mirror, cfg_packages):
- """Clone partial local mirror (one architecture per call)"""
- # Note: '-d .' is ignored, as each mirror defines its own path.
- main('clone -t deb -a {0} -r {1} -R {2} -d .'
- ' --ignore-errors-num 2 --retries-num 3 --threads-num 10'
- .format(_ARCH[architecture], cfg_mirror, cfg_packages).split(' '))
- force_logger_reload()
-
-def write_cfg_file(cfg_mirror, data):
- """Write configuration (yaml) file (package list / mirror defition)"""
- with open(cfg_mirror, 'w') as outfile:
- outfile.write(yaml.safe_dump(data, default_flow_style=False))
-
-def get_env(env_var, architecture=None):
- """Evaluate architecture-specific overrides of env vars"""
- if architecture:
- env_var_arch = '{0}_{1}'.format(env_var, architecture)
- if os.environ.get(env_var_arch):
- return os.environ[env_var_arch]
- if os.environ.get(env_var):
- return os.environ[env_var]
- return None
-
-# Architecture name mapping (dpkg:packetary) for packetary CLI invocation
-_ARCH = {
- "i386": "i386",
- "amd64": "x86_64",
- "arm64": "aarch64",
-}
-
-# Arch-indepedent configuration (old fuel-mirror + OPNFV extra packages)
-CFG_D = 'opnfv_config'
-CFG_OPNFV = 'opnfv_config.yaml'
-MOS_VERSION = get_env('MOS_VERSION')
-UBUNTU_ARCH = get_env('UBUNTU_ARCH')
-MIRROR_UBUNTU_PATH = get_env('MIRROR_UBUNTU_OPNFV_PATH')
-MIRROR_UBUNTU_TMP_PATH = '{0}.tmp'.format(MIRROR_UBUNTU_PATH)
-MIRROR_UBUNTU_MERGE = get_env('MIRROR_UBUNTU_MERGE')
-CFG_MM_UBUNTU = '{0}/ubuntu_mirror_local.yaml'.format(CFG_D)
-FUEL_BOOTSTRAP_CLI_FILE = open('fuel-agent/contrib/fuel_bootstrap/'
- 'fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample').read()
-FUEL_BOOTSTRAP_CLI = yaml.load(FUEL_BOOTSTRAP_CLI_FILE)
-FIXTURE_FILE = open('fuel-web/nailgun/nailgun/fixtures/openstack.yaml').read()
-FIXTURE = yaml.load(FIXTURE_FILE)
-OPNFV_CFG_YAML = open(CFG_OPNFV).read()
-OPNFV_CFG = yaml.load(OPNFV_CFG_YAML)
-
-# Create local partial mirror using packetary, one arch at a time
-for arch in UBUNTU_ARCH.split(' '):
- # Mirror / Package env vars, arch-overrideable
- mos_ubuntu = get_env('MIRROR_MOS_UBUNTU', arch)
- mos_ubuntu_root = get_env('MIRROR_MOS_UBUNTU_ROOT', arch)
- mirror_ubuntu = get_env('MIRROR_UBUNTU_URL', arch)
- plugins = get_env('BUILD_FUEL_PLUGINS', arch)
- if plugins is None:
- plugins = get_env('PLUGINS', arch)
-
- # Mirror / Package list configuration files (arch-specific)
- cfg_m_mos = '{0}/mos_{1}_mirror.yaml'.format(CFG_D, arch)
- cfg_m_ubuntu = '{0}/ubuntu_{1}_mirror.yaml'.format(CFG_D, arch)
- cfg_p_ubuntu = '{0}/ubuntu_{1}_packages.yaml'.format(CFG_D, arch)
- cfg_m_ubuntu_main = '{0}/ubuntu_{1}_mirror_main.yaml'.format(CFG_D, arch)
- cfg_p_ubuntu_main = '{0}/ubuntu_{1}_packages_main.yaml'.format(CFG_D, arch)
-
- # Mirror config fork before customizing (arch-specific)
- arch_mos = 'mos_{0}'.format(arch)
- arch_ubuntu = 'ubuntu_{0}'.format(arch)
- arch_packages = 'packages_{0}'.format(arch)
- OPNFV_CFG['groups'][arch_mos] = deepcopy(OPNFV_CFG['groups']['mos'])
- OPNFV_CFG['groups'][arch_ubuntu] = deepcopy(OPNFV_CFG['groups']['ubuntu'])
- OPNFV_CFG[arch_packages] = OPNFV_CFG['packages']
-
- # Mirror config update & conversion to packetary input
- group_main_ubuntu = dict()
- for group in OPNFV_CFG['groups'][arch_mos]:
- group['uri'] = "http://{}{}".format(mos_ubuntu, mos_ubuntu_root)
- group['suite'] = group['suite'].replace('$mos_version', MOS_VERSION)
- for group in OPNFV_CFG['groups'][arch_ubuntu]:
- group['uri'] = mirror_ubuntu
- # FIXME: At `create`, packetary insists on copying all pkgs to dest dir,
- # so configure it for another dir, which will replace the orig.
- group['path'] = MIRROR_UBUNTU_TMP_PATH
- if not group_main_ubuntu and 'main' in group:
- group_main_ubuntu = [deepcopy(group)]
- group_main_ubuntu[0]['section'] = ['main']
-
- # Mirror config dump: MOS (for dep resolution), Ubuntu, Ubuntu[main]
- write_cfg_file(cfg_m_mos, OPNFV_CFG['groups'][arch_mos])
- write_cfg_file(cfg_m_ubuntu, OPNFV_CFG['groups'][arch_ubuntu])
- if MIRROR_UBUNTU_MERGE is None:
- write_cfg_file(cfg_m_ubuntu_main, group_main_ubuntu)
- else:
- # FIXME: For multiarch, only one dump would be enough
- group_main_ubuntu[0]['origin'] = 'Ubuntu'
- group_main_ubuntu[0]['path'] = MIRROR_UBUNTU_PATH
- group_main_ubuntu[0]['uri'] = MIRROR_UBUNTU_PATH
- write_cfg_file(CFG_MM_UBUNTU, group_main_ubuntu[0])
-
- # Collect package dependencies from:
- ## 1. fuel_bootstrap_cli (bootstrap image additional packages)
- legacy_unresolved = legacy_diff(None, FUEL_BOOTSTRAP_CLI['packages'] + [
- FUEL_BOOTSTRAP_CLI['kernel_flavor'],
- FUEL_BOOTSTRAP_CLI['kernel_flavor'].replace('image', 'headers')],
- 'Bootstrap', arch)
- ## 2. openstack.yaml FIXTURE definition (default target image packages)
- for release in FIXTURE:
- editable = release['fields']['attributes_metadata']['editable']
- if 'provision' in editable and 'packages' in editable['provision']:
- release_pkgs = editable['provision']['packages']['value'].split()
- legacy_unresolved += legacy_diff(legacy_unresolved, release_pkgs,
- 'Release {0}'.format(release['fields']['name']), arch)
- ## 3. OPNFV additional packages (includes old fuel-mirror ubuntu.yaml pkgs)
- unresolved = dict()
- unresolved['mandatory'] = 'exact'
- unresolved['packages'] = from_legacy_pkglist(legacy_unresolved)
- if 'packages' in OPNFV_CFG:
- legacy_diff(legacy_unresolved, to_legacy_pkglist(OPNFV_CFG['packages']),
- 'OPNFV config', arch)
- unresolved['packages'] += OPNFV_CFG['packages']
-
- # OPNFV plugins dependency resolution
- if plugins:
- for plugin in plugins.split():
- path = "../{}/packages.yaml".format(plugin)
- if os.path.isfile(path):
- f = open(path).read()
- plugin_yaml = yaml.load(f)
- new_pkgs = legacy_diff(
- to_legacy_pkglist(unresolved['packages']),
- plugin_yaml['packages'], 'Plugin {0}'.format(plugin), arch)
- unresolved['packages'] += from_legacy_pkglist(new_pkgs)
-
- # Package list (reduced, i.e. no MOS deps, but with OPNFV plugin deps)
- if MIRROR_UBUNTU_MERGE is None:
- write_cfg_file(cfg_p_ubuntu_main, unresolved)
-
- # Mirror package list (full, including MOS/OPNFV plugin deps)
- unresolved['packages'] += get_unres_pkgs(arch, cfg_m_mos)
- write_cfg_file(cfg_p_ubuntu, unresolved)
- do_partial_mirror(arch, cfg_m_ubuntu, cfg_p_ubuntu)
- if MIRROR_UBUNTU_MERGE is None:
- # Ubuntu[main] must be evaluated after Ubuntu
- do_partial_mirror(arch, cfg_m_ubuntu_main, cfg_p_ubuntu_main)
-
-if MIRROR_UBUNTU_MERGE is None:
- shutil.move(MIRROR_UBUNTU_TMP_PATH, MIRROR_UBUNTU_PATH)
-else:
- # Construct single-component mirror from all components
- for arch in UBUNTU_ARCH.split(' '):
- cfg_pp_ubuntu = '{0}/ubuntu_{1}_packages_paths.yaml'.format(CFG_D, arch)
- # OPNFV blacklist
- opnfv_blacklist = to_legacy_pkglist(OPNFV_CFG['opnfv_blacklist'])
- # FIXME: We need scanpackages to omit older DEBs
- # Inspired from http://askubuntu.com/questions/198474/
- os.system('dpkg-scanpackages -a {0} {1} 2>/dev/null | '
- 'grep -e "^Filename:" | sed "s|Filename: |- file://|g" | '
- 'grep -v -E "\/({2})_" > {3}'
- .format(arch, MIRROR_UBUNTU_TMP_PATH,
- '|'.join(opnfv_blacklist), cfg_pp_ubuntu))
- do_local_repo(arch, CFG_MM_UBUNTU, cfg_pp_ubuntu)
- shutil.rmtree(MIRROR_UBUNTU_TMP_PATH)
diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
deleted file mode 100755
index c8c86db53..000000000
--- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-UBUNTU_DISTRO="xenial"
-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/${UBUNTU_DISTRO}-updates/main/binary-amd64 \
- dists/${UBUNTU_DISTRO}-updates/restricted/binary-amd64 \
- dists/${UBUNTU_DISTRO}-updates/universe/binary-amd64 \
- dists/${UBUNTU_DISTRO}-updates/multiverse/binary-amd64 \
- dists/${UBUNTU_DISTRO}-security/main/binary-amd64 \
- dists/${UBUNTU_DISTRO}-security/restricted/binary-amd64 \
- dists/${UBUNTU_DISTRO}-security/universe/binary-amd64 \
- dists/${UBUNTU_DISTRO}-security/multiverse/binary-amd64 \
- dists/${UBUNTU_DISTRO}-proposed/main/binary-amd64 \
- dists/${UBUNTU_DISTRO}-proposed/restricted/binary-amd64 \
- dists/${UBUNTU_DISTRO}-proposed/universe/binary-amd64 \
- dists/${UBUNTU_DISTRO}-proposed/multiverse/binary-amd64 \
- dists/${UBUNTU_DISTRO}/main/binary-amd64 \
- dists/${UBUNTU_DISTRO}/restricted/binary-amd64 \
- dists/${UBUNTU_DISTRO}/universe/binary-amd64 \
- dists/${UBUNTU_DISTRO}/multiverse/binary-amd64 \
- dists/${UBUNTU_DISTRO}-backports/main/binary-amd64 \
- dists/${UBUNTU_DISTRO}-backports/restricted/binary-amd64 \
- dists/${UBUNTU_DISTRO}-backports/universe/binary-amd64 \
- dists/${UBUNTU_DISTRO}-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|statusONE|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
- 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
- grep -q $url $TMPFILE && check_mirror $url && debugmsg "$url: OK"
- fi
-done
-
-echo "$BESTURL"
diff --git a/build/f_isoroot/f_tacker-pluginbuild/Makefile b/build/f_isoroot/f_tacker-pluginbuild/Makefile
deleted file mode 100644
index 9c97db777..000000000
--- a/build/f_isoroot/f_tacker-pluginbuild/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# 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_tacker-pluginbuild/config.mk b/build/f_isoroot/f_tacker-pluginbuild/config.mk
deleted file mode 100644
index 516adc7c1..000000000
--- a/build/f_isoroot/f_tacker-pluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
-
-TACKER_BRANCH?=master
-TACKER_REPO?="https://github.com/openstack/fuel-plugin-tacker"
-TACKER_CHANGE?=7068a300df0c695fb4589bf504b29cbed970ba58
diff --git a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml b/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
deleted file mode 100644
index c7775d120..000000000
--- a/build/f_isoroot/f_tacker-pluginbuild/packages.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-packages:
- - python-jsonrpclib
-
diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
deleted file mode 100644
index 73de611ff..000000000
--- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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: .vsperfbuild
-
-.PHONY: clean
-clean:
- @rm -f .vsperfbuild ../release/opnfv/fuel-plugin-vsperf*.rpm fuel-plugin-vsperf*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_vsperf-plugin.txt gitinfo_vsperf-plugin.txt
-
-.PHONY: release
-release:.vsperfbuild
- @rm -f ../release/opnfv/fuel-plugin-vsperf*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-vsperf*.rpm ../release/opnfv/
- cp gitinfo_vsperf-plugin.txt $(BUILD_BASE)
-
-.vsperfbuild:
- @rm -rf vswitchperf
- ../../docker/ubuntu-builder/install_docker.sh
- git clone $(VSPERF_REPO) vswitchperf
- cd vswitchperf; \
- git checkout $(VSPERF_BRANCH); \
- if [ ! -z $(VSPERF_CHANGE) ]; then \
- git fetch $(VSPERF_REPO) $(VSPERF_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- cd vswitchperf; \
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-vsperf/
- @mv vswitchperf/fuel-plugin-vsperf/fuel-plugin-vsperf*.rpm .
- $(REPOINFO) -r . > gitinfo_vsperf-plugin.txt
- @rm -rf fuel-plugin-vsperf
- @touch .vsperfbuild
- # 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 $(VSPERF_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(VSPERF_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(VSPERF_REPO) $(VSPERF_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(VSPERF_REPO) $(VSPERF_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 - .vsperfbuild fuel-plugin-vsperf*.rpm gitinfo_vsperf-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
deleted file mode 100644
index d1db7eb6f..000000000
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.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
-##############################################################################
-
-VSPERF_BRANCH?=stable/danube
-VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
-VSPERF_CHANGE?=5a48d6b78c014e62e7c233117abb61cc1f8844e6
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/Makefile b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
deleted file mode 100644
index 32de3b3f4..000000000
--- a/build/f_isoroot/f_yardstick-pluginbuild/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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: .yardstickbuild
-
-.PHONY: clean
-clean:
- @rm -f .yardstickbuild ../release/opnfv/fuel-plugin-yardstick*.rpm fuel-plugin-yardstick*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_yardstick-plugin.txt gitinfo_yardstick-plugin.txt
-
-.PHONY: release
-release:.yardstickbuild
- @rm -f ../release/opnfv/fuel-plugin-yardstick*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-yardstick*.rpm ../release/opnfv/
- cp gitinfo_yardstick-plugin.txt $(BUILD_BASE)
-
-.yardstickbuild:
- @rm -rf yardstick
- git clone $(YARDSTICK_REPO) yardstick
- cd yardstick; \
- git checkout $(YARDSTICK_BRANCH); \
- if [ ! -z $(YARDSTICK_CHANGE) ]; then \
- git fetch $(YARDSTICK_REPO) $(YARDSTICK_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- cd yardstick; \
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin/
- @mv yardstick/fuel-plugin/fuel-plugin-yardstick*.rpm .
- $(REPOINFO) -r . > gitinfo_yardstick-plugin.txt
- @rm -rf fuel-plugin-yardstick
- @touch .yardstickbuild
- # 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 $(YARDSTICK_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(YARDSTICK_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(YARDSTICK_REPO) $(YARDSTICK_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(YARDSTICK_REPO) $(YARDSTICK_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 - .yardstickbuild fuel-plugin-yardstick*.rpm gitinfo_yardstick-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
deleted file mode 100644
index 508a10eec..000000000
--- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# jonas.bjurel@eicsson.com
-# ruijing.guo@intel.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
-##############################################################################
-
-YARDSTICK_BRANCH?=stable/danube
-YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
-YARDSTICK_CHANGE?=7a4472954122ce97cc67acab2dc3207a1582370d
diff --git a/build/fuel_build_loop b/build/fuel_build_loop
deleted file mode 100755
index 324f28c1a..000000000
--- a/build/fuel_build_loop
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-echo "MIRROR_MOS_UBUNTU_ROOT=${MIRROR_MOS_UBUNTU_ROOT}"
-echo "MIRROR_FUEL=${MIRROR_FUEL}"
-
-maxcount=3
-cnt=0
-rc=1
-while [ $cnt -lt $maxcount ] && [ $rc -ne 0 ]
-do
- cnt=$[cnt + 1]
- echo -e "\n\n\n*** Starting build attempt # $cnt"
- cd /tmp/fuel-main
- make iso
- rc=$?
- if [ $rc -ne 0 ]; then
- echo "### Build failed with rc $rc ###"
- else
- echo "### Build successful at attempt # $cnt"
- fi
-done
-exit $rc
diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf
deleted file mode 100644
index 0f03305b6..000000000
--- a/build/install/apt-ftparchive-deb.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-Dir {
- ArchiveDir ".";
-};
-
-TreeDefault {
- Directory "pool";
-};
-
-BinDirectory "pool/main" {
- Packages "dists/mos10.0/main/binary-amd64/Packages";
-};
-
-Default {
- Packages {
- Extensions ".deb";
- Compress ". gzip bzip2";
- };
-};
-
-Contents {
- Compress "gzip";
-};
-
diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf
deleted file mode 100644
index 4425f2e34..000000000
--- a/build/install/apt-ftparchive-release.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-APT::FTPArchive::Release::Origin "Mirantis";
-APT::FTPArchive::Release::Label "mos10.0";
-APT::FTPArchive::Release::Suite "mos10.0";
-APT::FTPArchive::Release::Version "16.04";
-APT::FTPArchive::Release::Codename "mos10.0";
-APT::FTPArchive::Release::Architectures "amd64";
-APT::FTPArchive::Release::Components "main";
-APT::FTPArchive::Release::Description "Ubuntu 16.04.1 LTS";
diff --git a/build/install/apt-ftparchive-udeb.conf b/build/install/apt-ftparchive-udeb.conf
deleted file mode 100644
index 0cabe9425..000000000
--- a/build/install/apt-ftparchive-udeb.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-Dir {
- ArchiveDir ".";
-};
-
-TreeDefault {
- Directory "pool";
-};
-
-BinDirectory "pool/debian-installer" {
- Packages "dists/xenial/main/debian-installer/binary-amd64/Packages";
- BinOverride "./indices/override.xenial.main.debian-installer";
-};
-
-Default {
- Packages {
- Extensions ".udeb";
- Compress ". gzip";
- };
-};
-
-Contents {
- Compress "gzip";
-};
diff --git a/build/install/install.sh b/build/install/install.sh
deleted file mode 100755
index c03b7decb..000000000
--- a/build/install/install.sh
+++ /dev/null
@@ -1,491 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-my_exit() {
- rc=$?
-
- cd /tmp
-
- if [ -n "$TMP_HOSTMOUNT" ]; then
- if [ -d "$TMP_HOSTMOUNT" ]; then
- fusermount -u $TMP_HOSTMOUNT
- rmdir $TMP_HOSTMOUNT
- fi
- fi
-
- if [ -d "$TMP_OLDISO" ]; then
- fusermount -u $TMP_OLDISO
- rmdir $TMP_OLDISO
- fi
-
- if [ -f "$CONF" ]; then
- rm $CONF
- fi
-
- if [ -d "$TMP_ISOPUPPET" ]; then
- rm -Rf $TMP_ISOPUPPET
- fi
-}
-
-get_deb_name() {
- ar p $1 control.tar.gz | tar xzO ./control | grep "^Package:.* " | sed 's/.* //'
- if [ $PIPESTATUS -ne 0 ]; then
- echo "Error in get_deb_name($1)"
- exit 1
- fi
-}
-
-get_deb_rev() {
- ar p $1 control.tar.gz | tar xzO ./control | grep "^Version:.* " | sed 's/.* //'
- if [ $PIPESTATUS -ne 0 ]; then
- echo "Error in get_deb_rev($1)"
- exit 1
- fi
-}
-
-
-# Added logic for ".orig" files:
-# 1. Is there an .orig file for the new file?
-# 2. If the file is not present in base ISO -> Error!
-# 3. If the file is changed i base ISO -> Error! (need manual rebase)
-# 4. If there is no .orig file, but file is present in base ISO: Error!
-verify_orig_files() {
- OLDDIR=$1
- NEWDIR=$2
-
- pushd $NEWDIR >/dev/null
- for f in $(find * -type f -name '*.orig')
- do
- origfile=$NEWDIR/$f
- oldfile=$OLDDIR/$(echo $f | sed 's/.orig$//')
- newfile=$NEWDIR/$(echo $f | sed 's/.orig$//')
-
- origfile=${newfile}.orig
- # If no corresponding base file, error
- if [ ! -f $oldfile ]; then
- printf "\n\n\n\n"
- echo "Error: found ${newfile} but no"
- echo "Error: ${oldfile}"
- echo "Error: Manual rebase is needed!"
- printf "\n\n\n\n"
- exit 1
- fi
-
- # If orig file differs from base file, error
- if ! diff -q $origfile $oldfile > /dev/null; then
- printf "\n\n\n\n"
- echo "Error: $origfile differs from"
- echo "Error: $oldfile!"
- echo "Error: Manual rebase is needed!"
- printf "\n\n\n\n"
- exit 1
- fi
-
- done
-
-
- # Check that there we're not overwriting oldfiles without having a ".orig" copy
- for f in $(find * -type f ! -name '*.orig')
- do
- newfile=$NEWDIR/$(echo $f | sed 's/.orig$//')
- origfile=${newfile}.orig
- oldfile=$OLDDIR/$f
- if [ -f $oldfile ]; then
- if [ ! -f $origfile ]; then
- printf "\n\n\n\n"
- echo "Error: Will overwrite $oldfile, but there is no"
- echo "Error: $origfile!"
- echo "Error: You need to create the `basename $origfile`!"
- printf "\n\n\n\n"
- exit 1
- fi
- fi
- done
-
-
- popd >/dev/null
-}
-
-prep_make_live() {
- DEST=$TMP_HOSTMOUNT
- REPO=$DEST/var/www/nailgun/ubuntu/fuelweb/x86_64
- echo "Live install"
- ssh-copy-id root@$FUELHOST
- sshfs root@1${FUELHOST}:/ $TMP_HOSTMOUNT
-
- if [ -f $REPO/dists/xenial/main/binary-amd64/Packages.backup ]; then
- echo "Error - found backup file for Packages!"
- exit 1
- fi
-
- if [ -f $REPO/dists/xenial/main/binary-amd64/Packages.gz.backup ]; then
- echo "Error - found backup file for Packages.gz!"
- exit 1
- fi
-
- if [ -f $REPO/dists/xenial/Release.backup ]; then
- echo "Error - found backup file for Release!"
- exit 1
- fi
-
- if [ -d $DEST/etc/puppet.backup ]; then
- echo "Error - found backup file for Puppet!"
- exit 1
- fi
-
- cp $REPO/dists/xenial/main/binary-amd64/Packages $REPO/dists/xenial/main/binary-amd64/Packages.backup
- cp $REPO/dists/xenial/main/binary-amd64/Packages.gz $REPO/dists/xenial/main/binary-amd64/Packages.gz.backup
- cp $REPO/dists/xenial/Release $REPO/dists/xenial/Release.backup
- cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
-}
-
-post_make_live() {
- if [ -d $TOP/release/puppet/modules ]; then
- echo "Installing into Puppet:"
- cd $TOP/release/puppet/modules
- if [ `ls -1 | wc -l` -gt 0 ]; then
- for dir in *
- do
- echo " $dir"
- cp -Rp $dir $DEST/etc/puppet/modules
- done
- fi
- fi
-}
-
-make_live() {
- prep_make_live
- copy_packages
- post_make_live
-}
-
-
-prep_make_iso() {
- DEST=$TOP/newiso
- REPO=$DEST/ubuntu
- echo "Preparing ISO..."
- echo "Unpack of old ISO..."
- if [ -d newiso ]; then
- chmod -R 755 newiso
- rm -rf newiso
- fi
- mkdir newiso
- fusermount -u $TMP_OLDISO 2>/dev/null || cat /dev/null
- fuseiso -p $ORIGISO $TMP_OLDISO
- sleep 1
- cd $TMP_OLDISO
- find . | cpio -pd $TOP/newiso
- cd ..
- fusermount -u $TMP_OLDISO
- rm -Rf $TMP_OLDISO
- chmod -R 755 $TOP/newiso
-}
-
-make_iso_image() {
- echo "Making ISO..."
- cd $DEST
- find . -name TRANS.TBL -exec rm {} \;
- rm -rf rr_moved
-
- if [[ -z "$OPNFV_GIT_SHA" ]]; then
- OPNFV_GIT_SHA=$(git rev-parse --verify HEAD)
- fi
-
- mkisofs --quiet -r -V "$VOLUMEID" -publisher "$PUBLISHER" \
- -p "$OPNFV_GIT_SHA" -J -R -b isolinux/isolinux.bin \
- -no-emul-boot \
- -boot-load-size 4 -boot-info-table \
- --hide-rr-moved \
- --joliet-long \
- -x "lost+found" -o $NEWISO .
-
- isohybrid $NEWISO
-
- isoinfo -d -i $NEWISO
-}
-
-# iso_copy_puppet: Create a new puppet-slave.tgz for the iso
-iso_copy_puppet() {
- echo "Installing into Puppet..."
- mkdir -p $TMP_ISOPUPPET/release/puppet
- cd $TMP_ISOPUPPET/release/puppet
- tar xzf $DEST/puppet-slave.tgz
- cd $TOP/release/puppet/modules
-
- # Remove all .orig files before copying as they now have been verfied
-
- if [ -d $TOP/release/puppet/modules ]; then
- if [ `ls -1 | wc -l` -gt 0 ]; then
- verify_orig_files $TMP_ISOPUPPET/release/puppet $TOP/release/puppet/modules
- find $TOP/release/puppet/modules -type f -name '*.orig' -exec rm {} \;
- for dir in $TOP/release/puppet/modules/*
- do
- echo " $dir"
- cp -Rp $dir $TMP_ISOPUPPET/release/puppet
- done
- fi
- fi
-
- cd $TMP_ISOPUPPET/release/puppet
- tar czf $DEST/puppet-slave.tgz .
- cd $TOP
- rm -Rf $TMP_ISOPUPPET
-}
-
-# iso_modify_image: Add/patch files in the ISO root
-iso_modify_image () {
- # TODO: Add logic for ".orig" files (hey! make a function!), which would look
- # something like:
- # 1. Is there an .orig file?
- # 2. If the file is not present in origiso -> Error exit
- # 3. If the file is changed in origiso -> Error exit (need manual rebase)
- # 4. Otherwise continue, but don't copy orig file (or maybe we should?)
- # ... and corresponding reverse logic:
- # 1. If there is no .orig file, but file is present in origiso -> Error exit
- echo "Modify ISO files (wild copy)..."
-
- verify_orig_files $DEST $TOP/release/isoroot
- # Remove all .orig files before copying as they now have been verfied
- find $TOP/release/isoroot -type f -name '*.orig' -exec rm {} \;
-
- cd $TOP/release/isoroot
- cp -Rvp . $DEST
-
- # Add all Git info files
- sort $TOP/gitinfo*.txt > $DEST/gitinfo.txt
- cp $DEST/gitinfo.txt $REPORTFILE
-}
-
-make_iso() {
- prep_make_iso
- copy_packages
- #iso_copy_puppet
- iso_modify_image
- make_iso_image
-}
-
-copy_packages() {
- echo "Copying Debian packages..."
- cd $TOP/release/packages/ubuntu/pool/debian-installer
-
- for udeb in `ls -1 | grep '\.udeb$'`
- do
- echo " $udeb"
- cp $udeb $REPO/pool/debian-installer
- echo "Did not expect a package here, not supported"
- exit 1
- done
-
- cd $TOP/release/packages/ubuntu/pool/main
- for deb in `ls -1 | grep '\.deb$'`
- do
- echo " $deb"
- cp $deb $REPO/pool/main
- echo "Did not expect a package here, not supported"
- exit 1
- done
-
- echo "Running Fuel package patch file"
- pushd $REPO/pool/main > /dev/null
-
- for line in `cat $TOP/apply_patches | grep -v "^#" | grep -v "^$"`; do
- echo "Line is $line"
- echo "Did not expect a line here, not supported"
- exit 1
- ref=`echo $line | cut -d '>' -f 1`
- origpkg=`echo $line| cut -d '>' -f 2`
- url=`echo $line | cut -d '>' -f 3`
-
- if [ -z "$origpkg" ]; then
- echo "Error: No origpkg for patching"
- exit 1
- fi
-
- if [ -z "$url" ]; then
- echo "Error: No url for patching"
- exit 1
- fi
-
- if [ -z "$ref" ]; then
- echo "Error: No reference text for patching"
- exit 1
- fi
-
- echo "CM: Patching Fuel package for $ref" | tee -a $REPORTFILE
- echo "CM: Replacing package $origpkg with $url" | tee -a $REPORTFILE
- oldrev=`get_deb_rev $origpkg`
- rm $origpkg
- wget --quiet $url
- topkg=`basename $url`
- echo "CM: MD5 of new package:" | tee -a $REPORTFILE
- md5sum $topkg | tee -a $REPORTFILE
-
- patchname=`get_deb_name $topkg`
- patchrev=`get_deb_rev $topkg`
- echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE
- $TOP/patch-packages/tools/correct_deps $patchname $oldrev $patchrev | tee -a $REPORTFILE
- if [ $PIPESTATUS -ne 0 ]; then
- exit 1
- fi
- done
-
- printf "Done running Fuel patch file\n\n"
- echo "Running add packages file"
- for line in `cat $TOP/add_opnfv_packages | grep -v "^#" | grep -v "^$"`; do
- echo "Line is $line"
- echo "Did not expect a line here, not supported"
- exit 1
- ref=`echo $line | cut -d '>' -f 1`
- origpkg=`echo $line| cut -d '>' -f 2`
- url=`echo $line | cut -d '>' -f 3`
-
- if [ -z "$origpkg" ]; then
- echo "Error: No origpkg for patching"
- exit 1
- fi
-
- if [ -z "$url" ]; then
- echo "Error: No url for patching"
- exit 1
- fi
-
- if [ -z "$ref" ]; then
- echo "Error: No reference text for patching"
- exit 1
- fi
-
- if [ "$origpkg" != "NONE" ]; then
- echo "CM: Patching added package for $ref" | tee -a $REPORTFILE
- echo "CM: Replacing package $origpkg with $url" | tee -a $REPORTFILE
- oldrev=`get_deb_rev $origpkg`
- rm $origpkg
- else
- echo "CM: Adding previoulsy uninstalled package for $ref" tee -a $REPORTFILE
- fi
- wget --quiet $url
- topkg=`basename $url`
- echo "CM: MD5 of new package:" | tee -a $REPORTFILE
- md5sum $topkg | tee -a $REPORTFILE
- if [ "$origpkg" != "NONE" ]; then
- patchname=`get_deb_name $topkg`
- patchrev=`get_deb_rev $topkg`
- echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE
- $TOP/patch-packages/tools/correct_deps $patchname $oldrev $patchrev | tee -a $REPORTFILE
- if [ $PIPESTATUS -ne 0 ]; then
- exit 1
- fi
- fi
- done
- printf "Done running add packages file\n\n"
-
- popd > /dev/null
-
- if [ -f $TOP/patch-packages/release/patch-replacements ]; then
- echo "Applying package patches" | tee -a $REPORTFILE
- pushd $REPO/pool/main > /dev/null
- echo "CM: I am now in $(pwd)"
- printf "\n\n" | tee -a $REPORTFILE
- for line in `cat $TOP/patch-packages/release/patch-replacements`
- do
- echo "Did not expect a line here, not supported"
- exit 1
- echo "Processing $line ..."
- frompkg=`echo $line | cut -d ">" -f 1`
- topkg=`echo $line | cut -d ">" -f 2`
- echo "CM: Applying patch to $frompkg" | tee -a $REPORTFILE
- echo "CM: New package rev after patch: $topkg" | tee -a $REPORTFILE
-
- if [ ! -f $frompkg ]; then
- echo "Error: Can't find $frompkg in repo"
- exit 1
- else
- oldrev=`get_deb_rev $frompkg`
- echo "Removing $frompkg from repo"
- rm $frompkg
- fi
-
- if [ ! -f $TOP/patch-packages/release/packages/$topkg ]; then
- echo "Error: Can't find $topkg in patch release"
- exit 1
- else
- echo "Adding $topkg to repo"
- pkg_dest=$(dirname $frompkg)
- cp $TOP/patch-packages/release/packages/$topkg $pkg_dest/
- fi
-
- pushd $pkg_dest > /dev/null
- patchname=`get_deb_name $topkg`
- patchrev=`get_deb_rev $topkg`
- echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE
- $TOP/patch-packages/tools/correct_deps $patchname $oldrev $patchrev | tee -a $REPORTFILE
- if [ $PIPESTATUS -ne 0 ]; then
- exit 1
- fi
- popd > /dev/null
- done
- popd > /dev/null
- fi
-
- echo "Generating metadata..."
- pushd $REPO > /dev/null
-
- # The below methods are from 15B
- APT_REL_CONF="$TOP/install/apt-ftparchive-release.conf"
- APT_DEB_CONF="$TOP/install/apt-ftparchive-deb.conf"
- APT_UDEB_CONF="$TOP/install/apt-ftparchive-udeb.conf"
-
- echo Not running apt-ftparchive -c "${APT_REL_CONF}" generate "${APT_DEB_CONF}"
- echo Not running apt-ftparchive generate "${APT_UDEB_CONF}"
-
- # Fuel also needs this index file
- # cat dists/xenial/main/binary-amd64/Packages | \
- # awk '/^Package:/{pkg=$2}
- # /^Version:/{print pkg ": \"" $2 "\""}' > ubuntu-versions.yaml
- # cp ubuntu-versions.yaml $DEST
-
- # apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release
- # gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz
-
- popd > /dev/null
-
-}
-
-
-#############################################################################
-
-trap my_exit EXIT
-
-CONF=`mktemp /tmp/XXXXXXX`
-MODE=$1
-TOP=`pwd`
-
-if [ $MODE = "iso" ]; then
- PUBLISHER="OPNFV"
- TMP_OLDISO=`mktemp -d /tmp/XXXXXXX`
- TMP_ISOPUPPET=`mktemp -d /tmp/XXXXXXX`
- ORIGISO=$2
- NEWISO=$3
- VOLUMEID="$4_$5"
- REPORTFILE="${NEWISO}.txt"
- echo "Opening reportfile at $REPORTFILE"
- touch $REPORTFILE
- if [ ! -f $ORIGISO ]; then
- echo "Can't find original iso at $ORIGISO"
- rm $CONF
- exit 1
- fi
-
- make_iso
-else
- echo "Unknown mode: $MODE"
- exit 1
-fi
diff --git a/build/install/uninstall.sh b/build/install/uninstall.sh
deleted file mode 100755
index 5252c3093..000000000
--- a/build/install/uninstall.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-my_exit() {
- cd /tmp
- if [ -d "$MOUNT" ]; then
- fusermount -u $MOUNT
- rmdir $MOUNT
- fi
-}
-trap my_exit EXIT
-
-echo "Live uninstall is currently disabled as it is not tested"
-exit 1
-
-TOP=`pwd`
-MOUNT=`mktemp -d /tmp/XXXXXXX`
-ssh-copy-id root@10.20.0.2
-sshfs root@10.20.0.2:/ $MOUNT
-
-DEST=$MOUNT
-REPO=$DEST/var/www/nailgun/ubuntu/fuelweb/x86_64
-
-cd $REPO
-if [ ! -f $REPO/dists/xenial/main/binary-amd64/Packages.backup ]; then
- echo "Error - didn't find backup file for Packages!"
- exit 1
-fi
-
-if [ ! -f $REPO/dists/xenial/main/binary-amd64/Packages.gz.backup ]; then
- echo "Error - didn't find backup file for Packages.gz!"
- exit 1
-fi
-
-if [ ! -f $REPO/dists/xenial/Release.backup ]; then
- echo "Error - didn't find backup file for Release!"
- exit 1
-fi
-
-if [ ! -f $DEST/etc/puppet/manifests/site.pp.backup ]; then
- echo "Error - didn't find backup file for site.pp!"
- exit 1
-fi
-
-echo "Removing Debian packages:"
-cd $TOP/release/pool/main
-for deb in *.deb
-do
- echo " $deb"
- rm -Rf $REPO/pool/main/$deb
-done
-cd $REPO
-
-echo "Removing Puppet modules:"
-cd $TOP/puppet/modules
-for dir in *
-do
- echo " $dir"
- rm -Rf $DEST/etc/puppet/modules/$dir
-done
-cd $REPO
-
-echo "Restoring backups of datafiles"
-
-rm -f $REPO/dists/xenial/main/binary-amd64/Packages $REPO/dists/xenial/main/binary-amd64/Packages.gz
-rm -f $REPO/dists/xenial/Release $DEST/etc/puppet/manifests/site.pp
-mv $REPO/dists/xenial/main/binary-amd64/Packages.backup $REPO/dists/xenial/main/binary-amd64/Packages
-mv $REPO/dists/xenial/main/binary-amd64/Packages.gz.backup $REPO/dists/xenial/main/binary-amd64/Packages.gz
-mv $REPO/dists/xenial/Release.backup $REPO/dists/xenial/Release
-mv $DEST/etc/puppet/manifests/site.pp.backup $DEST/etc/puppet/manifests/site.pp
diff --git a/build/patch-packages/Makefile b/build/patch-packages/Makefile
deleted file mode 100644
index d12b53a72..000000000
--- a/build/patch-packages/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-SUBDIRS :=
-SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
-
-.PHONY: $(SUBDIRS) $(SUBCLEAN) clean
-$(SUBDIRS):
- @mkdir -p release/packages
- ORIGISO=$(ORIGISO) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
-
-release: $(SUBDIRS)
- @echo $(ORIGISO)
-
-clean: $(SUBCLEAN)
- @rm -Rf release
-
-$(SUBCLEAN): %.clean:
- $(MAKE) -C $* -f Makefile clean
diff --git a/build/patch-packages/tools/correct_deps b/build/patch-packages/tools/correct_deps
deleted file mode 100755
index cfb7d538f..000000000
--- a/build/patch-packages/tools/correct_deps
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-patch_package () {
- deb=$1
- pkgdep=$2
- newrev=$3
-
-
- tmpdir=`mktemp -d /tmp/patchXXXXX`
-
- cp $deb $tmpdir
- pushd $tmpdir > /dev/null
-
- mkdir -p repack
- dpkg -x $deb repack
-
- mkdir -p repack/DEBIAN
- dpkg -e $deb repack/DEBIAN
-
-
- pushd repack/DEBIAN > /dev/null
-
- echo "Before: `cat control | grep '^Depends:'`"
- sed -i "s/$pkgdep (\([^ ]*\) [^)]*)/$pkgdep (\1 $newrev)/" control
- echo "After: `cat control | grep '^Depends:'`"
- popd > /dev/null
-
- fakeroot dpkg-deb --build repack
-
- popd > /dev/null
-
- cp $tmpdir/repack.deb $deb
- rm -Rf $tmpdir
-}
-
-# Name of package for which to check dependencies to
-PKGDEP=$1
-# The old revision of the package in question
-OLDREV=$2
-# The new revision of the package in question
-NEWREV=$3
-
-if [ -z "$PKGDEP" ]; then
- echo "No package dependency name"
- exit 1
-fi
-
-if [ -z "$OLDREV" ]; then
- echo "No old rev"
- exit 1
-fi
-
-if [ -z "$NEWREV" ]; then
- echo "No new rev"
- exit 1
-fi
-
-
-for deb in *.deb
-do
- ar p $deb control.tar.gz | tar xzO ./control | grep -q "^Depends:.* ${PKGDEP} ([^ ]* ${OLDREV})"
- if [ $? -eq 0 ]; then
- name=`ar p $deb control.tar.gz | tar xzO ./control | grep "^Package:.* " | sed 's/.* //'`
- echo "**** Changing dependencies line in $deb ($name) ****"
- patch_package $deb $PKGDEP $NEWREV
- fi
-done
-
diff --git a/build/patch-packages/tools/deb_pack b/build/patch-packages/tools/deb_pack
deleted file mode 100755
index 1550d95d8..000000000
--- a/build/patch-packages/tools/deb_pack
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-my_exit() {
-
- if [ -d "$ISOROOT" ]; then
- fusermount -u $ISOROOT
- fi
-}
-
-ME=$(basename $0)
-
-trap my_exit EXIT
-
-REV="$(echo $1 | tr '_' '-')"
-if [ -z "$REV" ]; then
- echo "$ME: Error - no revision info provided"
- exit 1
-fi
-
-if [ ! -d package ]; then
- echo "$ME: Error - package directory does not exist"
- exit 1
-fi
-
-echo "Stepping revision number to $REV"
-
-
-revision_step ()
-{
- REV=$1
-
- sed -i "s/^\(Version:.*$\)/\1-opnfv$REV/" package/DEBIAN/control
-}
-
-md5sum_gen ()
-{
- pushd package
- find * -type f | grep -v "^DEBIAN/" | xargs md5sum | sort > DEBIAN/md5sums
- popd
-}
-
-revision_step $REV
-md5sum_gen
-fakeroot dpkg-deb --build package
-PKGNAME=`grep "^Package: " package/DEBIAN/control | awk '{ print $2 }'`
-PKGREV=`grep "^Version: " package/DEBIAN/control | awk '{ print $2 }'`
-mv package.deb ${PKGNAME}_${PKGREV}.deb
-
-ORIGPKG=`cat .package`
-
-# Add patch into file read by install.sh
-echo "$ORIGPKG>${PKGNAME}_${PKGREV}.deb" > patch-replacements
-
diff --git a/build/patch-packages/tools/deb_unpack b/build/patch-packages/tools/deb_unpack
deleted file mode 100755
index aaa60b743..000000000
--- a/build/patch-packages/tools/deb_unpack
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-my_exit() {
-
- if [ -d "$ISOROOT" ]; then
- fusermount -u $ISOROOT
- fi
-}
-
-ME=$(basename $0)
-
-trap my_exit EXIT
-
-
-if [ -z "$1" ]; then
- echo "$ME: Error - No package specified"
- exit 1
-fi
-
-if [ -z "$2" ]; then
- echo "$ME: Error - No ISO path specified"
- exit 1
-fi
-
-DEB=$1
-ORIGISO=$2
-DEST=package
-
-if [ -e $DEST -o -d $DEST ]; then
- echo "$ME: Error - $DEST already exists"
- exit 1
-fi
-
-ISOROOT=`mktemp -d /tmp/XXXXXXX`
-fuseiso -p $ORIGISO $ISOROOT
-sleep 1
-
-if [ ! -f $ISOROOT/ubuntu/pool/main/$DEB ];then
- echo "Could not find package $DEB in source ISO!"
-fi
-
-mkdir -p $DEST
-dpkg -x $ISOROOT/ubuntu/pool/main/$DEB $DEST
-
-mkdir -p $DEST/DEBIAN
-dpkg -e $ISOROOT/ubuntu/pool/main/$DEB $DEST/DEBIAN
-
-echo $DEB > .package \ No newline at end of file
diff --git a/build/patch-packages/tools/udeb_pack b/build/patch-packages/tools/udeb_pack
deleted file mode 100755
index e961a7320..000000000
--- a/build/patch-packages/tools/udeb_pack
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-my_exit() {
-
- if [ -d "$ISOROOT" ]; then
- fusermount -u $ISOROOT
- fi
-}
-
-ME=$(basename $0)
-
-trap my_exit EXIT
-
-if [ ! -d udebPackage ]; then
- echo "$ME: Error - package directory does not exist"
- exit 1
-fi
-
-echo "Stepping revision number to $REV"
-
-
-fakeroot dpkg-deb --build -Zgzip udebPackage
-PKGNAME=`grep "^Package: " udebPackage/DEBIAN/control | awk '{ print $2 }'`
-PKGREV=`grep "^Version: " udebPackage/DEBIAN/control | awk '{ print $2 }'`
-ARCH=`grep "^Architecture: " udebPackage/DEBIAN/control | awk '{ print $2 }'`
-mv udebPackage.deb ${PKGNAME}_${PKGREV}_${ARCH}.udeb
-
-ORIGPKG=`cat .udebpackage`
diff --git a/build/patch-packages/tools/udeb_unpack b/build/patch-packages/tools/udeb_unpack
deleted file mode 100755
index ed9cd21aa..000000000
--- a/build/patch-packages/tools/udeb_unpack
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-
-my_exit() {
-
- if [ -d "$ISOROOT" ]; then
- fusermount -u $ISOROOT
- fi
-}
-
-ME=$(basename $0)
-
-trap my_exit EXIT
-
-
-if [ -z "$1" ]; then
- echo "$ME: Error - No package specified"
- exit 1
-fi
-
-if [ -z "$2" ]; then
- echo "$ME: Error - No ISO path specified"
- exit 1
-fi
-
-DEB=$1
-ORIGISO=$2
-DEST=udebPackage
-
-if [ -e $DEST -o -d $DEST ]; then
- echo "$ME: Error - $DEST already exists"
- exit 1
-fi
-
-ISOROOT=`mktemp -d /tmp/XXXXXXX`
-fuseiso -p $ORIGISO $ISOROOT
-sleep 1
-
-if [ ! -f $ISOROOT/ubuntu/pool/debian-installer/$DEB ];then
- echo "Could not find package $DEB in source ISO!"
-fi
-
-mkdir -p $DEST
-dpkg -x $ISOROOT/ubuntu/pool/debian-installer/$DEB $DEST
-
-mkdir -p $DEST/DEBIAN
-dpkg -e $ISOROOT/ubuntu/pool/debian-installer/$DEB $DEST/DEBIAN
-
-echo $DEB > .udebpackage
diff --git a/build/patch-packages/tr_example/Makefile b/build/patch-packages/tr_example/Makefile
deleted file mode 100644
index b7cab3590..000000000
--- a/build/patch-packages/tr_example/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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)
-
-.PHONY: all
-all:
-
-.PHONY: clean
-clean:
- @rm -rf package
- @rm -rf *.deb
- @rm -rf patch-replacements
- @rm -rf .package
-
-.PHONY: release
-release:
- ../tools/deb_unpack python-oslo.messaging_1.3.0-fuel5.1~mira4_all.deb $(ORIGISO)
- @mkdir -p package/etc
- @echo "Hello, world" > package/etc/hello.txt
- ../tools/deb_pack $(REVSTATE)
- @cp *.deb ../release/packages
- @cat patch-replacements >> ../release/patch-replacements
diff --git a/build/repo_info.sh b/build/repo_info.sh
deleted file mode 100755
index 347ede7f7..000000000
--- a/build/repo_info.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-usage() {
- cat <<EOF
-Usage: `basename $0` [-r] <path>
-
- -r
- Recursively list all repos found starting at <path>
- -h
- Display help text
-EOF
-}
-
-repoinfo() {
- repotop=$(git -C $1 rev-parse --show-toplevel)
- origin=$(git -C $repotop config --get remote.origin.url)
- sha1=$(git -C $repotop rev-parse HEAD)
- echo "$origin: $sha1"
-}
-
-
-if [ $# -eq 2 ]; then
- case $1 in
- -r)
- RECURSE=1
- shift
- ;;
- -h)
- usage
- exit 0
- ;;
- *)
- echo "Error, argument $1 not known" >&2
- usage
- exit 1
- esac
-fi
-
-if [ $# -gt 1 ]; then
- echo "Error, too many arguments" >&2
- usage
- exit 1
-fi
-
-abspath=$(readlink -f $1)
-
-if [ -n "$RECURSE" ]; then
- for dir in $(find $abspath -type d -name .git)
- do
- repoinfo $(readlink -f $dir/..)
- done
-else
- repoinfo $abspath
-fi
diff --git a/build/select_closest_fuel_mirror.py b/build/select_closest_fuel_mirror.py
deleted file mode 100755
index 0fdc69eac..000000000
--- a/build/select_closest_fuel_mirror.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/python
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.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
-##############################################################################
-
-# Select closest fuel mirror based on latency measured with ping.
-# Failsafe: The us1 mirror
-
-from subprocess import Popen,PIPE
-import re
-from operator import itemgetter
-
-mirrors = [ "us1", "cz1" ]
-FNULL = open('/dev/null', 'w')
-try:
- re_avg = re.compile(r'.* = [^/]*/([^/]*).*')
-
- pingtime = {}
- for mirror in mirrors:
- fqdn = "mirror.seed-"+mirror+".fuel-infra.org"
- pingtime[fqdn] = 0
- pipe = Popen("ping -c 3 " + fqdn + " | tail -1",shell = True, stdout=PIPE, stderr=FNULL)
- avg = pipe.communicate()[0]
- pipe.stdout.close()
- pingtime[fqdn] = float(re_avg.split(avg)[1])
-
- print sorted(pingtime.items(), key=itemgetter(1))[0][0]
-except:
- print "mirror.seed-"+mirrors[0]+".fuel-infra.org"