From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- build/variables.sh | 60 ------------------------------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 build/variables.sh (limited to 'build/variables.sh') diff --git a/build/variables.sh b/build/variables.sh deleted file mode 100644 index f944c592..00000000 --- a/build/variables.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. -# -# 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_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -BUILD_DIR="$(dirname ${BUILD_ROOT})/.build" -QUAGGA_RPMS_DIR=${BUILD_DIR}/quagga_build_dir -CACHE_DIR="$(dirname ${BUILD_ROOT})/.cache" -CACHE_HISTORY=".cache_history" -PATCHES_DIR="${BUILD_ROOT}/patches" -BUILD_UTILS="$(dirname ${BUILD_ROOT})/apex/build_utils.py" - -# Run virt-customize commands with a guest memory of 4G to avoid -# oom issues on some of the larger build steps -VIRT_CUSTOMIZE="virt-customize -m 4096" - -rdo_images_uri=${RDO_IMAGES_URI:-https://images.rdoproject.org/pike/delorean/current-tripleo} - -onos_release_uri=https://downloads.onosproject.org/release/ -onos_release_file=onos-1.8.4.tar.gz -onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado -onos_ovs_uri=http://artifacts.opnfv.org/apex/colorado -onos_ovs_pkg=package_ovs_rpm3.tar.gz -if [ -z ${GS_PATHNAME+x} ]; then - GS_PATHNAME=/colorado -fi -dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv/danube -dpdk_rpms=( -'ovs4opnfv-e8acab14-dpdk-16.11-5.el7.centos.x86_64.rpm' -'ovs4opnfv-e8acab14-dpdk-devel-16.11-5.el7.centos.x86_64.rpm' -'ovs4opnfv-e8acab14-dpdk-examples-16.11-5.el7.centos.x86_64.rpm' -'ovs4opnfv-e8acab14-dpdk-tools-16.11-5.el7.centos.x86_64.rpm' -) - -kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube" -kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.rpm" - -calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install" -calipso_script="calipso-installer.py" - -#netvpp_repo="https://github.com/openstack/networking-vpp" -netvpp_repo="https://github.com/fepan/networking-vpp" -netvpp_branch="test-fdio-fix" -netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}') -netvpp_pkg=python-networking-vpp-18.04-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm - -gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm - -nosdn_vpp_rpms=( -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/18.01.1-release.x86_64/vpp-18.01.1-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/18.01.1-release.x86_64/vpp-plugins-18.01.1-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/18.01.1-release.x86_64/vpp-lib-18.01.1-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/18.01.1-release.x86_64/vpp-api-python-18.01.1-release.x86_64.rpm' -) -- cgit 1.2.3-korg