From 9f8aff6636e0d86834178b461802f3e7cb95189d Mon Sep 17 00:00:00 2001 From: "Stefan K. Berg" Date: Wed, 12 Oct 2016 16:42:35 +0200 Subject: Uplift to Fuel 10.0/Newton Build working, automated deploy working (simple test cases only). All plugins disabled, so is the generation of the local ISO cache. Both need to be re-enabled after merge of this uplift. All patches wiped, pertinent ones need to be re-enabled after the merge of this uplift. Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2 Signed-off-by: Stefan K. Berg --- build/install/apt-ftparchive-deb.conf | 2 +- build/install/apt-ftparchive-release.conf | 10 +++++----- build/install/install.sh | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'build/install') diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf index edcb1f2a4..0f03305b6 100644 --- a/build/install/apt-ftparchive-deb.conf +++ b/build/install/apt-ftparchive-deb.conf @@ -17,7 +17,7 @@ TreeDefault { }; BinDirectory "pool/main" { - Packages "dists/mos9.0/main/binary-amd64/Packages"; + Packages "dists/mos10.0/main/binary-amd64/Packages"; }; Default { diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf index e40ff68b4..4425f2e34 100644 --- a/build/install/apt-ftparchive-release.conf +++ b/build/install/apt-ftparchive-release.conf @@ -9,10 +9,10 @@ ############################################################################## APT::FTPArchive::Release::Origin "Mirantis"; -APT::FTPArchive::Release::Label "mos9.0"; -APT::FTPArchive::Release::Suite "mos9.0"; -APT::FTPArchive::Release::Version "14.04"; -APT::FTPArchive::Release::Codename "mos9.0"; +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 Trusty Tahr 14.04 LTS"; +APT::FTPArchive::Release::Description "Ubuntu 16.04.1 LTS"; diff --git a/build/install/install.sh b/build/install/install.sh index d1a49f35f..198f26cb5 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -390,6 +390,7 @@ copy_packages() { 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 @@ -447,8 +448,10 @@ copy_packages() { # /^Version:/{print pkg ": \"" $2 "\""}' > ubuntu-versions.yaml # cp ubuntu-versions.yaml $DEST - apt-ftparchive -c "${APT_REL_CONF}" release dists/mos9.0/ > dists/mos9.0/Release - gzip -9cf dists/mos9.0/Release > dists/mos9.0/Release.gz + echo apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release + apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release + echo gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz + gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz popd > /dev/null -- cgit 1.2.3-korg