Increase ceph pod resources for tempest

This patch increases the tempest resources required for Ceph and fixes the allow and skip list endpoints for tempest. Signed-off-by: Francesco Pantano <[email protected]>
openshift · Feb 28, 2024 · 3052d8c · 3052d8c
1 parent 6781c16
commit 3052d8c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...r/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh b/...r/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh
@@ -7,7 +7,7 @@ OPENSTACK_OPERATOR="openstack-operator"
 BASE_DIR=${HOME:-"/alabama"}
 NS_SERVICES=${NS_SERVICES:-"openstack"}
 export CEPH_HOSTNETWORK=${CEPH_HOSTNETWORK:-"true"}
-export CEPH_DATASIZE=${CEPH_DATASIZE:="2Gi"}
+export CEPH_DATASIZE=${CEPH_DATASIZE:="8Gi"}
 export CEPH_TIMEOUT=${CEPH_TIMEOUT:="90"}
 
 # We don't want to use OpenShift-CI build cluster namespace

diff --git a/...ator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml b/...ator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml
@@ -26,7 +26,7 @@ ref:
       default: "true"
       documentation: When enabled, allow to bind the pod to the hostnetwork of the worker node.
     - name: CEPH_DATASIZE
-      default: "2Gi"
+      default: "8Gi"
       documentation: Ceph volumes data size.
     - name: CEPH_TIMEOUT
       default: "90"

diff --git a/...tor/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh b/...tor/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh
@@ -6,7 +6,7 @@ META_OPERATOR="openstack-operator"
 ORG="openstack-k8s-operators"
 # Export Ceph options for tests that call 'make ceph'
 export CEPH_HOSTNETWORK=${CEPH_HOSTNETWORK:-"true"}
-export CEPH_DATASIZE=${CEPH_DATASIZE:="2Gi"}
+export CEPH_DATASIZE=${CEPH_DATASIZE:="8Gi"}
 export CEPH_TIMEOUT=${CEPH_TIMEOUT:="90"}
 
 # We don't want to use OpenShift-CI build cluster namespace

diff --git a/...erator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml b/...erator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml
@@ -17,7 +17,7 @@ ref:
       default: "true"
       documentation: When enabled, allow to bind the pod to the hostnetwork of the worker node.
     - name: CEPH_DATASIZE
-      default: "2Gi"
+      default: "8Gi"
       documentation: Ceph volumes data size.
     - name: CEPH_TIMEOUT
       default: "90"

diff --git a/...step-registry/openstack-k8s-operators/tempest/openstack-k8s-operators-tempest-commands.sh b/...step-registry/openstack-k8s-operators/tempest/openstack-k8s-operators-tempest-commands.sh
@@ -90,11 +90,11 @@ fi
 if [ "$TEMPEST_REGEX" ]; then
     tempest run --regex $TEMPEST_REGEX "${TEMPEST_ARGS[@]}"
 else
-    curl -O https://opendev.org/openstack/openstack-tempest-skiplist/raw/branch/master/openstack-operators/tempest_allow.yml
-    curl -O https://opendev.org/openstack/openstack-tempest-skiplist/raw/branch/master/openstack-operators/tempest_skip.yml
+    curl -O https://raw.githubusercontent.com/openstack-k8s-operators/ci-framework/main/roles/tempest/files/list_allowed.yml
+    curl -O https://raw.githubusercontent.com/openstack-k8s-operators/ci-framework/main/roles/tempest/files/list_skipped.yml
 
-    tempest-skip list-allowed --file tempest_allow.yml --group ${BASE_OP} --job ${BASE_OP} -f value > allow.txt
-    tempest-skip list-skipped --file tempest_skip.yml --job ${BASE_OP} -f value > skip.txt
+    tempest-skip list-allowed --file list_allowed.yml --group ${BASE_OP} --job ${BASE_OP} -f value > allow.txt
+    tempest-skip list-skipped --file list_skipped.yml --job ${BASE_OP} -f value > skip.txt
     if [ -f allow.txt ] && [ -f skip.txt ]; then
         TEMPEST_ARGS+=( --exclude-list skip.txt --include-list allow.txt)
         cp allow.txt skip.txt ${ARTIFACT_DIR}