diff options
| -rw-r--r-- | build/Makefile | 10 | ||||
| -rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
| -rwxr-xr-x | build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 4 | ||||
| -rw-r--r-- | build/f_isoroot/f_yardstick-pluginbuild/config.mk | 2 | ||||
| -rw-r--r-- | deploy/cloud/configure_nodes.py | 1 | ||||
| -rw-r--r-- | deploy/cloud/deploy.py | 3 | ||||
| -rw-r--r-- | deploy/cloud/deployment.py | 5 | ||||
| -rw-r--r-- | deploy/common.py | 3 | ||||
| -rw-r--r-- | deploy/deploy-config.py | 10 | ||||
| -rwxr-xr-x | deploy/deploy.py | 1 | ||||
| -rw-r--r-- | deploy/deploy_env.py | 1 | ||||
| -rw-r--r-- | deploy/dha_adapters/zte_adapter.py | 2 | ||||
| -rw-r--r-- | deploy/install_fuel_master.py | 1 |
13 files changed, 12 insertions, 33 deletions
diff --git a/build/Makefile b/build/Makefile index c8fc79385..d4b981a9d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -51,9 +51,13 @@ export REPOINFO := $(BUILD_BASE)/repo_info.sh # Use snapshots # Use nearby repositories -export MIRROR_UBUNTU_URL := $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh --url) -export MIRROR_UBUNTU := $(shell echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f3 ) -export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f4-) +export MIRROR_UBUNTU_URL ?= $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh) +export MIRROR_UBUNTU ?= $(shell echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f3 ) +export MIRROR_UBUNTU_ROOT ?= $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | cut -d'/' -f4-) +ifeq (,$(MIRROR_UBUNTU_URL)) +$(warning $(shell ./f_isoroot/f_repobuild/select_ubuntu_repo.sh -d)) +$(error No sane Ubuntu mirror available) +endif export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py) diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index e189e1697..a011000a3 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild +PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild export PLUGINS NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index 24bd42234..5618eb79b 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -69,14 +69,14 @@ if [ "$1" == "-d" ]; then fi # Hardcode for testing purposes -DEBUG=1 +# DEBUG=1 TMPFILE=$(mktemp /tmp/mirrorsXXXXX)A trap cleanup exit # Generate a list of mirrors considered as "up" curl -s https://launchpad.net/ubuntu/+archivemirrors | \ - grep -P -B8 "statusUP|statusSIX" | \ + grep -P -B8 "statusUP|statusONE|statusSIX" | \ grep -o -P "(f|ht)tp.*\"" | \ sed 's/"$//' | sort | uniq > $TMPFILE diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk index 88b1ea604..6cf00b74c 100644 --- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk +++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk @@ -8,6 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -YARDSTICK_BRANCH?=86b9fc4f434c72bd276e4bf1ce7d7f5a04b150b2 +YARDSTICK_BRANCH?=0e23c697e6329a57ba168cc57886b436ea87cdc4 YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git YARDSTICK_CHANGE?= diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index ea50307b1..f9f65afb5 100644 --- a/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py @@ -8,7 +8,6 @@ ############################################################################### import copy -import glob import io import six diff --git a/deploy/cloud/deploy.py b/deploy/cloud/deploy.py index e00934bd9..dac2fe8dd 100644 --- a/deploy/cloud/deploy.py +++ b/deploy/cloud/deploy.py @@ -8,9 +8,6 @@ ############################################################################### -import yaml -import io - from dea import DeploymentEnvironmentAdapter from configure_environment import ConfigureEnvironment from deployment import Deployment diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 5dd026318..28bcfdf1d 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py @@ -13,15 +13,10 @@ import json from common import ( N, - E, exec_cmd, - run_proc, - run_proc_wait_terminated, - run_proc_kill, parse, err, log, - delete, ) SEARCH_TEXT = '(err)' diff --git a/deploy/common.py b/deploy/common.py index dab9602c5..b3d552415 100644 --- a/deploy/common.py +++ b/deploy/common.py @@ -15,7 +15,6 @@ import os import logging import argparse import shutil -import stat import errno import time import shlex @@ -126,7 +125,7 @@ def clean(lines): return parsed if len(parsed_list) == 1 else parsed_list -def err(message, fun = None, *args): +def err(message, fun=None, *args): LOG.error('%s\n' % message) if fun: fun(*args) diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index d2567d97b..5f5699cd7 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -31,17 +31,7 @@ import time import collections import hashlib -from functools import reduce -from operator import or_ from common import ( - log, - exec_cmd, - err, - warn, - check_file_exists, - create_dir_if_not_exists, - delete, - check_if_root, ArgParser, ) diff --git a/deploy/deploy.py b/deploy/deploy.py index f491929e0..057a0579c 100755 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -14,7 +14,6 @@ import io import re import sys import yaml -import errno import signal import netaddr diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py index 93dc3959b..8afaeb143 100644 --- a/deploy/deploy_env.py +++ b/deploy/deploy_env.py @@ -20,7 +20,6 @@ from ssh_client import SSHClient from common import ( err, log, - exec_cmd, parse, N, E, diff --git a/deploy/dha_adapters/zte_adapter.py b/deploy/dha_adapters/zte_adapter.py index da651ca15..5d7939aa2 100644 --- a/deploy/dha_adapters/zte_adapter.py +++ b/deploy/dha_adapters/zte_adapter.py @@ -8,13 +8,11 @@ ############################################################################### -import time from ipmi_adapter import IpmiAdapter from common import ( log, exec_cmd, - err, ) diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py index a0e28b033..2da69e350 100644 --- a/deploy/install_fuel_master.py +++ b/deploy/install_fuel_master.py @@ -16,7 +16,6 @@ from dha_adapters.libvirt_adapter import LibvirtAdapter from common import ( log, err, - clean, delete, ) |