summaryrefslogtreecommitdiffstats
path: root/tools/deploy.sh
diff options
context:
space:
mode:
authorJames Gu <james.gu@att.com>2020-11-19 20:34:59 -0800
committerJames Gu <james.gu@att.com>2020-11-24 09:45:26 -0800
commit53fcf67dbb9545fa939aa11386e26bfe3dda6cad (patch)
tree41103fab62ba15a9baa8db6dd93144535fd6c604 /tools/deploy.sh
parent157d1b63efaea4468e0dab6666727401cdf85f27 (diff)
functest configuration for AS 1.8
added rally sanity blacklist, updated tempest conf and test.sh. updated TM revision in site-definition.yaml for pod 15 and 17. Change-Id: I25b848e545a1a72428ba7d33ffebdd3f39be5b99 Signed-off-by: James Gu <james.gu@att.com>
Diffstat (limited to 'tools/deploy.sh')
-rwxr-xr-xtools/deploy.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/deploy.sh b/tools/deploy.sh
index b5b97a2..d1be5d6 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -28,6 +28,7 @@ source $(dirname "$(realpath $0)")/../site/$1/$1.env
if [ -z "$AS_HOME" ]; then
WORK_DIR=$(mktemp -d)
+ echo "Working directory is set to $WORK_DIR"
trap "{ sudo rm -rf $WORK_DIR; }" EXIT
else
WORK_DIR=$AS_HOME
@@ -155,7 +156,7 @@ pre_genesis() {
fi
ssh $GEN_SSH 'sudo cp /etc/default/grub /etc/default/grub.orig'
- ssh $GEN_SSH 'sudo sed -i "/GRUB_CMDLINE_LINUX=\"/c GRUB_CMDLINE_LINUX=\"hugepagesz=1G hugepages=12 transparent_hugepage=never default_hugepagesz=1G dpdk-socket-mem=4096,4096 iommu=pt intel_iommu=on amd_iommu=on cgroup_disable=hugetlb console=ttyS1,115200n8\"" /etc/default/grub'
+ ssh $GEN_SSH 'sudo sed -i "/GRUB_CMDLINE_LINUX=\"/c GRUB_CMDLINE_LINUX=\"hugepagesz=1G hugepages=10 transparent_hugepage=never default_hugepagesz=1G dpdk-socket-mem=4096,4096 iommu=pt intel_iommu=on amd_iommu=on cgroup_disable=hugetlb console=ttyS1,115200n8\"" /etc/default/grub'
ssh $GEN_SSH 'sudo update-grub'
# upstream pre-geneis is not ready to be used directly yet
@@ -235,7 +236,6 @@ create_public_network() {
public-network
}
-
create_dpdk_flavor() {
export OS_AUTH_URL=${OS_AUTH_URL_IDENTITY}
sudo -E treasuremap/tools/openstack flavor create --ram 1024 --disk 1 --vcpus 1 --public --property hw:mem_page_size=large dpdk.tiny
@@ -248,6 +248,12 @@ create_cirros_image() {
rm -rf cirros-0.5.1-x86_64-disk.img cirros
}
+deploy_test_conf() {
+ sudo mkdir -p /home/opnfv/functest
+ sudo cp airship/tools/files/blacklist.yaml /home/opnfv/functest
+ sudo cp airship/tools/files/tempest_conf.yaml /home/opnfv/functest
+}
+
case "$2" in
'pre_genesis')
pre_genesis
@@ -263,16 +269,19 @@ case "$2" in
create_cirros_image
create_dpdk_flavor
create_public_network
+ deploy_test_conf
;;
'update_site')
clone_repos
pegleg_collect
site_action $2
+ deploy_test_conf
;;
'update_software')
clone_repos
pegleg_collect
site_action $2
+ deploy_test_conf
;;
'init_cloud')
create_cirros_image