aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-12 21:32:05 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-12 21:34:00 +0200
commitbdc49b80cb4f592ac7f0a1affd912be8329cd379 (patch)
tree183865615986106b7094e6a19ef348e92776ff74
parent7bfd9276c1902abd7136376861fa4058855c8535 (diff)
Upstream: Fuel@OPNFV: Fuel Master VM templates
While at it, also upstream: "build: Use OPNFV_GIT_SHA for ISO preparer ID" JIRA: ARMBAND-146 Change-Id: Ifcd7b3041d172aa492e26477c0872cd96efd90ba Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch76
-rw-r--r--patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch107
2 files changed, 0 insertions, 183 deletions
diff --git a/patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch b/patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
deleted file mode 100644
index 27b00c71..00000000
--- a/patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Wed, 17 Aug 2016 21:56:22 +0200
-Subject: [PATCH] build: Use OPNFV_GIT_SHA for ISO preparer ID
-
-isoinfo -i lists the following information for Fuel@OPNFV ISO:
-"Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3"
-where the SHA hash is Fuel git repo HEAD SHA.
-
-For Armband's build system, using only the Fuel commit ID is not
-enough to fully describe the state of the source code, as patches
-are also applied to other fuel modules (as git submodules).
-Instead, a pointer to a valid Armband commit ID should be used.
-
-However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
-commit hash, so the ISO metadata should also reflect this.
-
-While at it, allow product name to be overriden, to signal the
-commit ID should be looked up inside the Armband repository.
-
-Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/Makefile | 4 ++--
- build/docker/runcontext | 2 +-
- build/install/install.sh | 6 +++++-
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/build/Makefile b/build/Makefile
-index 56acb40..ac85498 100644
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -21,11 +21,11 @@ SHELL = /bin/bash
- export MOSVERSION = 9.0
- export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso
- export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
--export PRODNO = "OPNFV_FUEL"
-+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)
-+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)
-
-diff --git a/build/docker/runcontext b/build/docker/runcontext
-index daad663..2d13562 100755
---- a/build/docker/runcontext
-+++ b/build/docker/runcontext
-@@ -115,7 +115,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
- -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 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"
-
-diff --git a/build/install/install.sh b/build/install/install.sh
-index c632419..866d304 100755
---- a/build/install/install.sh
-+++ b/build/install/install.sh
-@@ -196,8 +196,12 @@ make_iso_image() {
- 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 `git rev-parse --verify HEAD` -J -R -b isolinux/isolinux.bin \
-+ -p "$OPNFV_GIT_SHA" -J -R -b isolinux/isolinux.bin \
- -no-emul-boot \
- -boot-load-size 4 -boot-info-table \
- --hide-rr-moved \
diff --git a/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch b/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch
deleted file mode 100644
index e1e2e58e..00000000
--- a/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Wed, 4 May 2016 14:27:23 +0200
-Subject: [PATCH] Fuel VM for the Enea Armband lab
-
-This is the initial VM description fit for Enea's Armband lab.
-
-Change-Id: Ia89f9728fff0ab1c279f6200fd558d9643cf4ea5
-Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
----
- .../hardware_environment/vms/enea_lab/fuel.xml | 88 ++++++++++++++++++++++
- 1 file changed, 88 insertions(+)
- create mode 100644 deploy/templates/hardware_environment/vms/enea_lab/fuel.xml
-
-diff --git a/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml
-new file mode 100644
-index 0000000..8773ed4
---- /dev/null
-+++ b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml
-@@ -0,0 +1,88 @@
-+<domain type='kvm' id='1'>
-+ <name>fuel</name>
-+ <memory unit='KiB'>8290304</memory>
-+ <currentMemory unit='KiB'>8290304</currentMemory>
-+ <vcpu placement='static'>4</vcpu>
-+ <resource>
-+ <partition>/machine</partition>
-+ </resource>
-+ <os>
-+ <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
-+ <boot dev='cdrom'/>
-+ <boot dev='hd'/>
-+ <bootmenu enable='no'/>
-+ </os>
-+ <features>
-+ <acpi/>
-+ <apic/>
-+ <pae/>
-+ </features>
-+ <cpu mode='host-model'>
-+ <model fallback='allow'/>
-+ </cpu>
-+ <clock offset='utc'>
-+ <timer name='rtc' tickpolicy='catchup'/>
-+ <timer name='pit' tickpolicy='delay'/>
-+ <timer name='hpet' present='no'/>
-+ </clock>
-+ <on_poweroff>destroy</on_poweroff>
-+ <on_reboot>restart</on_reboot>
-+ <on_crash>restart</on_crash>
-+ <pm>
-+ <suspend-to-mem enabled='no'/>
-+ <suspend-to-disk enabled='no'/>
-+ </pm>
-+ <devices>
-+ <emulator>/usr/libexec/qemu-kvm</emulator>
-+ <disk type='file' device='disk'>
-+ <driver name='qemu' type='qcow2' cache='writeback'/>
-+ <target dev='vda' bus='virtio'/>
-+ </disk>
-+ <disk type='block' device='cdrom'>
-+ <driver name='qemu' type='raw'/>
-+ <target dev='hdb' bus='ide'/>
-+ <readonly/>
-+ </disk>
-+ <controller type='usb' index='0' model='ich9-ehci1'>
-+ </controller>
-+ <controller type='usb' index='0' model='ich9-uhci1'>
-+ <master startport='0'/>
-+ </controller>
-+ <controller type='usb' index='0' model='ich9-uhci2'>
-+ <master startport='2'/>
-+ </controller>
-+ <controller type='usb' index='0' model='ich9-uhci3'>
-+ <master startport='4'/>
-+ </controller>
-+ <controller type='pci' index='0' model='pci-root'>
-+ </controller>
-+ <controller type='ide' index='0'>
-+ </controller>
-+ <controller type='virtio-serial' index='0'>
-+ </controller>
-+ <interface type='bridge'>
-+ <model type='virtio'/>
-+ </interface>
-+ <interface type='bridge'>
-+ <model type='virtio'/>
-+ </interface>
-+ <serial type='pty'>
-+ <source path='/dev/pts/0'/>
-+ <target port='0'/>
-+ </serial>
-+ <console type='pty' tty='/dev/pts/0'>
-+ <source path='/dev/pts/0'/>
-+ <target type='serial' port='0'/>
-+ </console>
-+ <input type='mouse' bus='ps2'/>
-+ <input type='keyboard' bus='ps2'/>
-+ <graphics type='vnc' port='5906' autoport='yes' listen='127.0.0.1'>
-+ <listen type='address' address='127.0.0.1'/>
-+ </graphics>
-+ <video>
-+ <model type='vga' vram='16384' heads='1'/>
-+ </video>
-+ <memballoon model='virtio'>
-+ </memballoon>
-+ </devices>
-+</domain>