aboutsummaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml7
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile91
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk13
-rw-r--r--build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml8
4 files changed, 15 insertions, 104 deletions
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
index d6fea9269..1ba7201f4 100644
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
@@ -1,2 +1,9 @@
+##############################################################################
+# 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_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
deleted file mode 100644
index 9455389bf..000000000
--- a/build/f_isoroot/f_ovsnfv-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: .ovsnfvbuild
-
-.PHONY: clean
-clean:
- @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv-*.rpm fuel-plugin-ovsnfv-*.rpm
- @rm -f $(BUILD_BASE)/gitinfo_ovsnfv-dpdk-plugin.txt gitinfo_ovsnfv-dpdk-plugin.txt
-
-.PHONY: release
-release:.ovsnfvbuild
- @rm -f ../release/opnfv/fuel-plugin-ovsnfv-*.rpm
- @mkdir -p ../release/opnfv
- @cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/
- cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE)
-
-.ovsnfvbuild:
- @rm -rf ovsnfv
- git clone $(OVSNFV_DPDK_REPO) ovsnfv
- cd ovsnfv; \
- git checkout $(OVSNFV_DPDK_BRANCH); \
- if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \
- git fetch $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE); \
- git checkout FETCH_HEAD; \
- fi
- cd ovsnfv; \
- INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR)
- @mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm .
- $(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt
- @rm -rf ovsnfv
- @touch .ovsnfvbuild
- # 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 $(OVSNFV_DPDK_BRANCH)
-# - The contents of this Makefile
-.cacheid:
- @if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \
- $(CACHETOOL) getcommitid $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE) > .cachedata; \
- else \
- $(CACHETOOL) getcommitid $(OVSNFV_DPDK_REPO) $(OVSNFV_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 - .ovsnfvbuild fuel-plugin-ovsnfv*.rpm gitinfo_ovsnfv-dpdk-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
deleted file mode 100644
index 1893fce4a..000000000
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
+++ /dev/null
@@ -1,13 +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
-##############################################################################
-
-OVSNFV_DPDK_BRANCH=stable/brahmaputra
-OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
-OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
-OVSNFV_DPDK_CHANGE=
diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
index d8fab974f..fcf4257f1 100644
--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2015,2016 Ericsson AB and others.
+# mskalski@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
---
root_ssh_authorized_file: /root/.ssh/id_rsa.pub
extend_kopts: "biosdevname=0 net.ifnames=1 debug ignore_loglevel log_buf_len=10M print_fatal_signals=1 LOGLEVEL=8"