Skip to content

Commit

Permalink
mgr/dashboard: fix for cephadm e2e failing because of rgw commands ge…
Browse files Browse the repository at this point in the history
…tting stuck

Delaying the rgw service creation in the tests until the cluster is
healthy

also changing the node_ip_offset to 110 because in the jenkins I saw

Fixes: https://tracker.ceph.com/issues/54030
Signed-off-by: Nizamudeen A <nia@redhat.com>
  • Loading branch information
nizamial09 committed Feb 4, 2022
1 parent c47ace9 commit 347fb2e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
Expand Up @@ -7,6 +7,7 @@ cleanup() {
if [[ -n "$JENKINS_HOME" ]]; then
printf "\n\nStarting cleanup...\n\n"
kcli delete plan -y ceph || true
kcli delete network ceph-dashboard -y
docker container prune -f
printf "\n\nCleanup completed.\n\n"
fi
Expand Down
Expand Up @@ -26,20 +26,19 @@ describe('Create cluster create services page', () => {
});

describe('when Orchestrator is available', () => {
const serviceName = 'rgw.foo';
const serviceName = 'mds.test';

it('should create an rgw and mds service', () => {
createService('rgw', serviceName, '2');
createService('mds', 'mds.test');
it('should create an mds service', () => {
createService('mds', serviceName, '1');
});

it('should edit a service', () => {
const daemonCount = '4';
const daemonCount = '2';
createClusterServicePage.editService(serviceName, daemonCount);
createClusterServicePage.expectPlacementCount(serviceName, daemonCount);
});

it('should delete the mds service', () => {
it('should delete mds service', () => {
createClusterServicePage.deleteService('mds.test');
});
});
Expand Down
Expand Up @@ -14,6 +14,12 @@ describe('Host Page', () => {
});

// rgw is needed for testing the force maintenance
it('should create rgw services', () => {
services.navigateTo('create');
services.addService('rgw', false, '4');
services.checkExist('rgw.foo', true);
});

it('should check if rgw daemon is running on all hosts', () => {
for (const hostname of hostnames) {
hosts.clickTab('cd-host-details', hostname, 'Daemons');
Expand Down

0 comments on commit 347fb2e

Please sign in to comment.