From 3052d8cb455ab94e7ef1c2aaa22d0b7a0d5190d5 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 27 Feb 2024 22:37:01 +0100 Subject: [PATCH] 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 --- .../deploy/openstack-k8s-operators-deploy-commands.sh | 2 +- .../deploy/openstack-k8s-operators-deploy-ref.yaml | 2 +- .../kuttl/openstack-k8s-operators-kuttl-commands.sh | 2 +- .../kuttl/openstack-k8s-operators-kuttl-ref.yaml | 2 +- .../tempest/openstack-k8s-operators-tempest-commands.sh | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh b/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh index e7a3fdd4d043..c9e4327c01fc 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-commands.sh +++ b/ci-operator/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/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml b/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml index 11c8acde4add..a413322082d0 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/deploy/openstack-k8s-operators-deploy-ref.yaml +++ b/ci-operator/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/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh b/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh index 1c7017ec64b0..4aaa2939b580 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-commands.sh +++ b/ci-operator/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/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml b/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml index 5f5a59ea477c..ffa821d76eea 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/kuttl/openstack-k8s-operators-kuttl-ref.yaml +++ b/ci-operator/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/ci-operator/step-registry/openstack-k8s-operators/tempest/openstack-k8s-operators-tempest-commands.sh b/ci-operator/step-registry/openstack-k8s-operators/tempest/openstack-k8s-operators-tempest-commands.sh index 17a0a384a32c..7844ec19f94a 100644 --- a/ci-operator/step-registry/openstack-k8s-operators/tempest/openstack-k8s-operators-tempest-commands.sh +++ b/ci-operator/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}