summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Dillaman <dillaman@redhat.com>2020-03-13 00:22:22 +0100
committerGitHub <noreply@github.com>2020-03-13 00:22:22 +0100
commit5cf9cd5d1c73425924afabe7fcc659b377c791c5 (patch)
tree77fb8ec16b1adaaa860a894da1483fe821f30534
parentMerge pull request #33840 from trociny/wip-schedule-optimize-scan (diff)
parentqa/suites/rbd: removed OpenStack tempest test cases (diff)
downloadceph-5cf9cd5d1c73425924afabe7fcc659b377c791c5.tar.xz
ceph-5cf9cd5d1c73425924afabe7fcc659b377c791c5.zip
Merge pull request #33900 from dillaman/wip-44459
qa/suites/rbd: removed OpenStack tempest test cases Reviewed-by: Mykola Golub <mgolub@suse.com>
-rw-r--r--qa/suites/rbd/openstack/%0
l---------qa/suites/rbd/openstack/.qa1
l---------qa/suites/rbd/openstack/base/.qa1
-rw-r--r--qa/suites/rbd/openstack/base/install.yaml7
-rw-r--r--qa/suites/rbd/openstack/clusters/+0
l---------qa/suites/rbd/openstack/clusters/.qa1
-rw-r--r--qa/suites/rbd/openstack/clusters/fixed-2.yaml9
-rw-r--r--qa/suites/rbd/openstack/clusters/openstack.yaml4
l---------qa/suites/rbd/openstack/features/.qa1
-rw-r--r--qa/suites/rbd/openstack/features/minimum.yaml5
l---------qa/suites/rbd/openstack/objectstore1
l---------qa/suites/rbd/openstack/supported-random-distro$1
l---------qa/suites/rbd/openstack/workloads/.qa1
-rw-r--r--qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml51
-rwxr-xr-xqa/workunits/rbd/run_devstack_tempest.sh130
15 files changed, 0 insertions, 213 deletions
diff --git a/qa/suites/rbd/openstack/% b/qa/suites/rbd/openstack/%
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/qa/suites/rbd/openstack/%
+++ /dev/null
diff --git a/qa/suites/rbd/openstack/.qa b/qa/suites/rbd/openstack/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/openstack/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/base/.qa b/qa/suites/rbd/openstack/base/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/openstack/base/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/base/install.yaml b/qa/suites/rbd/openstack/base/install.yaml
deleted file mode 100644
index 740d32c00cd..00000000000
--- a/qa/suites/rbd/openstack/base/install.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-- ceph:
-overrides:
- ceph:
- log-whitelist:
- - \(POOL_APP_NOT_ENABLED\)
diff --git a/qa/suites/rbd/openstack/clusters/+ b/qa/suites/rbd/openstack/clusters/+
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/qa/suites/rbd/openstack/clusters/+
+++ /dev/null
diff --git a/qa/suites/rbd/openstack/clusters/.qa b/qa/suites/rbd/openstack/clusters/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/openstack/clusters/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/clusters/fixed-2.yaml b/qa/suites/rbd/openstack/clusters/fixed-2.yaml
deleted file mode 100644
index 473c205411f..00000000000
--- a/qa/suites/rbd/openstack/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
- ceph-deploy:
- conf:
- global:
- osd pool default size: 2
- osd crush chooseleaf type: 0
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, osd.2]
-- [client.0]
diff --git a/qa/suites/rbd/openstack/clusters/openstack.yaml b/qa/suites/rbd/openstack/clusters/openstack.yaml
deleted file mode 100644
index 3310e9d3c5a..00000000000
--- a/qa/suites/rbd/openstack/clusters/openstack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-openstack:
- - volumes: # attached to each instance
- count: 1
- size: 30 # GB
diff --git a/qa/suites/rbd/openstack/features/.qa b/qa/suites/rbd/openstack/features/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/openstack/features/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/features/minimum.yaml b/qa/suites/rbd/openstack/features/minimum.yaml
deleted file mode 100644
index 429b8e145a0..00000000000
--- a/qa/suites/rbd/openstack/features/minimum.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
- ceph:
- conf:
- client:
- rbd default features: 1
diff --git a/qa/suites/rbd/openstack/objectstore b/qa/suites/rbd/openstack/objectstore
deleted file mode 120000
index c40bd326145..00000000000
--- a/qa/suites/rbd/openstack/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/supported-random-distro$ b/qa/suites/rbd/openstack/supported-random-distro$
deleted file mode 120000
index 0862b4457b3..00000000000
--- a/qa/suites/rbd/openstack/supported-random-distro$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$ \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/workloads/.qa b/qa/suites/rbd/openstack/workloads/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/openstack/workloads/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml b/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
deleted file mode 100644
index 1f810788a36..00000000000
--- a/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-tasks:
-- qemu:
- all:
- type: filesystem
- cpus: 4
- memory: 12288
- disks:
- - image_size: 30720
- - image_size: 30720
- test: qa/workunits/rbd/run_devstack_tempest.sh
- image_url: https://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img
- cloud_config_archive:
- - type: text/cloud-config
- content: |
- users:
- - name: stack
- lock_passwd: False
- shell: /bin/bash
- sudo: ["ALL=(root) NOPASSWD:ALL\nDefaults:stack,tempest !requiretty"]
- - name: tempest
- lock_passwd: False
- shell: /bin/bash
- sudo:
- - "ALL=(root) NOPASSWD:/sbin/ip"
- - "ALL=(root) NOPASSWD:/sbin/iptables"
- - "ALL=(root) NOPASSWD:/usr/bin/ovsdb-client"
- - |
- #!/bin/bash -ex
- wget -q -O- "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc" | apt-key add -
- wget -q -O /etc/apt/sources.list.d/ceph.list "https://shaman.ceph.com/api/repos/ceph/{ceph_branch}/{ceph_sha1}/ubuntu/bionic/repo"
- apt-get update
-
- mount --bind /mnt/test_b /opt
- mkdir /opt/stack
- chown -R stack:stack /home/stack
- chown -R stack:stack /opt/stack
-
- mkdir /mnt/log/stack
- chmod a+rwx /mnt/log/stack
- chown -R stack:stack /mnt/log/stack
-
- apt-get install -y ceph-common librbd1
-
- mkdir /mnt/log/stack/ceph
- chown -R stack:stack /mnt/log/stack/ceph
- chmod a+rwx /mnt/log/stack/ceph
-
- # sanity check that the cluster is reachable from the VM
- echo '[client]' >> /etc/ceph/ceph.conf
- echo 'log file = /mnt/log/stack/ceph/$name.$pid.log' >> /etc/ceph/ceph.conf
- rbd --debug-ms=10 --debug-rbd=20 info client.0.1
diff --git a/qa/workunits/rbd/run_devstack_tempest.sh b/qa/workunits/rbd/run_devstack_tempest.sh
deleted file mode 100755
index 6d63a992c86..00000000000
--- a/qa/workunits/rbd/run_devstack_tempest.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-STACK_BRANCH=stable/rocky
-TEMPEST_BRANCH=19.0.0
-
-STACK_USER=${STACK_USER:-stack}
-STACK_GROUP=${STACK_GROUP:-stack}
-TEMPEST_USER=${TEMPEST_USER:-tempest}
-
-STACK_HOME_PATH=${STACK_HOME_PATH:-/home/stack}
-STACK_OPT_PATH=${STACK_OPT_PATH:-/opt/stack}
-STACK_LOG_PATH=${STACK_LOG_PATH:-/mnt/log/stack}
-
-cleanup() {
- echo "**** cleanup"
-
- # ensure teuthology can clean up the logs
- [ -d ${STACK_LOG_PATH} ] && chmod -R a+rwx ${STACK_LOG_PATH}
-
- mkdir ${STACK_LOG_PATH}/etc
- cp -dpr /etc/cinder ${STACK_LOG_PATH}/etc || true
- cp -dpr /etc/glance ${STACK_LOG_PATH}/etc || true
- cp -dpr /etc/nova ${STACK_LOG_PATH}/etc || true
-
- # kill all OpenStack services
- if [ -d ${STACK_OPT_PATH}/devstack ]; then
- cd ${STACK_OPT_PATH}/devstack
- sudo -H -u ${STACK_USER} ./unstack.sh || true
- fi
-}
-
-trap cleanup INT TERM EXIT
-
-# devstack configuration adapted from upstream gate
-cat<<EOF > ${STACK_HOME_PATH}/local.conf
-[[local|localrc]]
-ENABLE_CEPH_CINDER=True
-ENABLE_CEPH_GLANCE=True
-ENABLE_CEPH_C_BAK=True
-ENABLE_CEPH_NOVA=True
-Q_USE_DEBUG_COMMAND=True
-NETWORK_GATEWAY=10.1.0.1
-USE_SCREEN=False
-DATA_DIR=${STACK_OPT_PATH}/data
-ACTIVE_TIMEOUT=90
-BOOT_TIMEOUT=90
-ASSOCIATE_TIMEOUT=60
-TERMINATE_TIMEOUT=60
-MYSQL_PASSWORD=secretmysql
-DATABASE_PASSWORD=secretdatabase
-RABBIT_PASSWORD=secretrabbit
-ADMIN_PASSWORD=secretadmin
-SERVICE_PASSWORD=secretservice
-SERVICE_TOKEN=111222333444
-SWIFT_HASH=1234123412341234
-ROOTSLEEP=0
-NOVNC_FROM_PACKAGE=True
-ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,ceilometer-acentral,ceilometer-acompute,ceilometer-alarm-evaluator,ceilometer-alarm-notifier,ceilometer-anotification,ceilometer-api,ceilometer-collector,cinder,dstat,etcd3,g-api,g-reg,key,mysql,n-api,n-api-meta,n-cauth,n-cond,n-cpu,n-novnc,n-obj,n-sch,peakmem_tracker,placement-api,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy,tempest
-SKIP_EXERCISES=boot_from_volume,bundle,client-env,euca
-SYSLOG=False
-SCREEN_LOGDIR=${STACK_LOG_PATH}/screen-logs
-LOGFILE=${STACK_LOG_PATH}/devstacklog.txt
-VERBOSE=True
-FIXED_RANGE=10.1.0.0/20
-IPV4_ADDRS_SAFE_TO_USE=10.1.0.0/20
-FLOATING_RANGE=172.24.5.0/24
-PUBLIC_NETWORK_GATEWAY=172.24.5.1
-FIXED_NETWORK_SIZE=4096
-VIRT_DRIVER=libvirt
-SWIFT_REPLICAS=1
-SWIFT_START_ALL_SERVICES=False
-LOG_COLOR=False
-UNDO_REQUIREMENTS=False
-CINDER_PERIODIC_INTERVAL=10
-
-export OS_NO_CACHE=True
-LIBS_FROM_GIT=
-EBTABLES_RACE_FIX=True
-DEBUG_LIBVIRT_COREDUMPS=False
-CINDER_VOLUME_CLEAR=none
-LIBVIRT_TYPE=kvm
-VOLUME_BACKING_FILE_SIZE=24G
-TEMPEST_HTTP_IMAGE=http://git.openstack.org/static/openstack.png
-FORCE_CONFIG_DRIVE=False
-
-CINDER_ENABLED_BACKENDS=ceph:ceph
-TEMPEST_STORAGE_PROTOCOL=ceph
-REMOTE_CEPH=True
-
-enable_plugin devstack-plugin-mariadb https://github.com/openstack/devstack-plugin-mariadb
-enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
-EOF
-
-cat<<EOF > ${STACK_HOME_PATH}/start.sh
-#!/usr/bin/env bash
-set -ex
-cd ${STACK_OPT_PATH}
-git clone https://git.openstack.org/openstack-dev/devstack -b ${STACK_BRANCH}
-
-# TODO workaround for https://github.com/pypa/setuptools/issues/951
-git clone https://git.openstack.org/openstack/requirements.git -b ${STACK_BRANCH}
-sed -i 's/appdirs===1.4.0/appdirs===1.4.3/' requirements/upper-constraints.txt
-
-cd devstack
-cp ${STACK_HOME_PATH}/local.conf .
-
-export TEMPEST_BRANCH=${TEMPEST_BRANCH}
-export PYTHONUNBUFFERED=true
-export PROJECTS="openstack/devstack-plugin-ceph openstack/devstack-plugin-mariadb"
-
-./stack.sh
-EOF
-
-# execute devstack
-chmod 0755 ${STACK_HOME_PATH}/start.sh
-sudo -H -u ${STACK_USER} ${STACK_HOME_PATH}/start.sh
-
-# switch to rbd profile caps
-ceph auth caps client.cinder mon 'profile rbd' osd 'profile rbd pool=volumes, profile rbd pool=vms, profile rbd pool=images'
-ceph auth caps client.cinder-bak mon 'profile rbd' osd 'profile rbd pool=backups, profile rbd pool=volumes'
-ceph auth caps client.glance mon 'profile rbd' osd 'profile rbd pool=images'
-
-# execute tempest
-chown -R ${TEMPEST_USER}:${STACK_GROUP} ${STACK_OPT_PATH}/tempest
-chown -R ${TEMPEST_USER}:${STACK_GROUP} ${STACK_OPT_PATH}/data/tempest
-chmod -R o+rx ${STACK_OPT_PATH}/devstack/files
-
-cd ${STACK_OPT_PATH}/tempest
-sudo -H -u ${TEMPEST_USER} tox -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3