mgr/dashbaord: Fix E2E pools page failure

The problem was that pg autoscaling is set to "on" by default. Therefore
the pg_num field is hidden, which caused the error. Now the test sets
the pg autoscaling to "off" revealing the pg_num field to make the tests
pass.

Fixes: https://tracker.ceph.com/issues/43594
Fixes: https://tracker.ceph.com/issues/43102
Signed-off-by: Stephan Müller <smueller@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts
index 66072b0243d90a62dbf0a4b9e6b617e54e5543a2..bda20d6f5f1d72ac238435f3f71f392da09a7dd4 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts
@@ -38,6 +38,8 @@ export class PoolPageHelper extends PageHelper {
     await nameInput.sendKeys(name);
     await this.selectOption('poolType', 'replicated');
 
+    await this.expectSelectOption('pgAutoscaleMode', 'on');
+    await this.selectOption('pgAutoscaleMode', 'off'); // To show pgNum field
     await $('input[name=pgNum]').sendKeys(
       protractor.Key.CONTROL,
       'a',

diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
index 9930d45aab21ebf61ed94ef292a10e80a14b0286..8b11db606d07537ee4d5b3ed551b18c5890d7c05 100755 (executable)
--- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
@@ -55,13 +55,6 @@ if [ "$BASE_URL" == "" ]; then
     # Set SSL verify to False
     ./bin/ceph dashboard set-rgw-api-ssl-verify False
 
-    # Disable PG autoscaling for new pools. This is a temporary workaround.
-    # e2e tests for pools should be adapted to remove this workaround after
-    # these issues are resolved:
-    # - https://tracker.ceph.com/issues/38227
-    # - https://tracker.ceph.com/issues/42638
-    ./bin/ceph config set global osd_pool_default_pg_autoscale_mode off
-
     BASE_URL=$(./bin/ceph mgr services | jq -r .dashboard)
 fi