From e7e2d84bec0d404057bce203f9c90231360e88ee Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 31 May 2016 22:34:54 +0200 Subject: Rebase: deploy related patch series. After change "common.py: catch stderr in exec_cmd" [1] and other unrelated changes were merged upstream, we need to rebase the complete deploy related series. While we're at it, re-export Fuel@OPNFV patches in Armband. [1] https://gerrit.opnfv.org/gerrit/#/c/14561/ Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a --- ...low-customizing-java-and-fuel-mirror-URLs.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch (limited to 'patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch') diff --git a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch deleted file mode 100644 index 719ec935..00000000 --- a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Stanislaw Kardach -Date: Wed, 24 Feb 2016 20:02:25 +0100 -Subject: [PATCH] Allow customizing java and fuel-mirror URLs - ---- - build/f_isoroot/f_odlpluginbuild/config.mk | 2 +- - build/f_isoroot/f_repobuild/Makefile | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk -index a5e8a96..e64a05e 100644 ---- a/build/f_isoroot/f_odlpluginbuild/config.mk -+++ b/build/f_isoroot/f_odlpluginbuild/config.mk -@@ -12,6 +12,6 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a - ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" - - export USE_JAVA8=true --export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb -+export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb - export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz - export ODL_VERSION_NUMBER=0.4.1 -diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile -index e95dbf2..709ca6b 100644 ---- a/build/f_isoroot/f_repobuild/Makefile -+++ b/build/f_isoroot/f_repobuild/Makefile -@@ -12,6 +12,7 @@ SHELL := /bin/bash - TOP := $(shell pwd) - TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2) - # Enable use of exact repo commit if defined, else use Fuel main branch -+FUEL_MIRROR_REPO:=https://github.com/openstack/fuel-mirror - FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG) - - include ../../config.mk -@@ -26,7 +27,7 @@ nailgun: - sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml - rm -Rf nailgun - sudo mkdir -p /var/www/nailgun -- git clone https://github.com/openstack/fuel-mirror -+ git clone $(FUEL_MIRROR_REPO) - cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT) - sudo pip install -U -r ./fuel-mirror/requirements.txt - sudo pip install ./fuel-mirror -- cgit 1.2.3-korg