Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport some of the changes from master to 2.8 #1419

Merged
merged 5 commits into from
May 4, 2024

Conversation

jstourac
Copy link
Member

@jstourac jstourac commented May 3, 2024

Based on the #1370 - this backports some that seem to be minimal effort and useful for the branch for the future:

CI: rhods-smoke/5317 - three failed tests passed on a re-run

jstourac added 5 commits May 3, 2024 18:00
In case the `poetry install` command fails, we probably don't want to
continue in the execution anymore, so let's have a fail fast check
there.

(cherry picked from commit ea67c95)
We are trying to retrieve the ID of the cluster that OCM uses for its
work. For this we use either the cluster name or the cluster ID
(different ID to the one that OCM uses). The cluster ID is saved in the
external_id key.

Also, to keep this function reflexive, let's keep also `id` in the query
too. With this, we can always call this function and get the ocm ID for
the cluster anytime we use cluster `name`, `external ID` or `ID`.

(cherry picked from commit 2ab713a)
The original `qaprodauth.console.redhat.com` has been moved to
`console.dev.redhat.com`.

Also changed variable names to uppercase since these are the section
variables.

(cherry picked from commit 1af11d2)
During our global move to PatternFly 5 changes in Dashboard, we probably
accidentally changed also selector for the OCM login page, which still
uses older version obviously.

On top of that I updated some other xpaths for the OCM and also amended
the way how the Cookies settings modal window is being handled since it
also seem to slightly different now.

(cherry picked from commit d905c6f)
This isn't a complete complex update of all relevant tests, just a
selected update. Minimum required changes were taken from [1,2].

[1] red-hat-data-services#1394
[2] red-hat-data-services#1312
@jstourac jstourac added the 2.8.z label May 3, 2024
@jstourac jstourac self-assigned this May 3, 2024
Copy link

sonarqubecloud bot commented May 3, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@@ -40,14 +40,14 @@
END

Maybe Accept Cookie Policy
${cookie_required}= Run Keyword And Return Status Page Should Contain We use cookies on this site
${cookie_required}= Run Keyword And Return Status Wait Until Page Contains Element

Check warning

Code scanning / Robocop

The assignment sign is not consistent within the file. Expected '{{ expected_sign }}' but got '{{ actual_sign }}' instead Warning test

The assignment sign is not consistent within the file. Expected ' =' but got '=' instead
Copy link
Contributor

github-actions bot commented May 3, 2024

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass %
451 0 0 451 100

@jstourac jstourac marked this pull request as ready for review May 4, 2024 10:06
@jstourac jstourac merged commit 0cdd34e into red-hat-data-services:releases/2.8.0 May 4, 2024
10 checks passed
@jstourac jstourac deleted the backport28 branch May 4, 2024 10:09
@jstourac jstourac added verified This PR has been tested with Jenkins enhancements Bugfixes, enhancements, refactoring, ... in tests or libraries (PR will be listed in release-notes) labels May 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.8.z enhancements Bugfixes, enhancements, refactoring, ... in tests or libraries (PR will be listed in release-notes) verified This PR has been tested with Jenkins
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant