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

QE: Fix GH validation core stage #7740

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Conversation

srbarrios
Copy link
Member

What does this PR change?

Having refactored in a previous PR how we handle synchronization of channels, we missed the fact that we don't need a different Cucumber feature on the GH Validation in order to create the fake repositories, therefore we can delete it and re-use the same Cucumber feature that we use in our CI test suite.

GUI diff

No difference.

  • DONE

Documentation

  • No documentation needed

  • DONE

Test coverage

  • Cucumber tests were adapted

  • DONE

Links

No Ports:

  • Manager-4.3 (For now, we did not port GH Validations to Spacewalk)

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/7740/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/7740/checks.
See the troubleshooting guide if you need any help.

⚠️ You should not merge if acceptance tests fail to pass. ⚠️

Happy hacking!

Copy link
Contributor

@ktsamis ktsamis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, make sure you don't leave it as a draft as soon as the acceptance tests pass

Copy link
Contributor

@jordimassaguerpla jordimassaguerpla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if tests pass, looks good to me

@srbarrios srbarrios force-pushed the qe-fix-gh-validation-reposync branch from a7f502f to a6b6f03 Compare October 23, 2023 12:01
@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/7740/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/7740/checks.
See the troubleshooting guide if you need any help.

⚠️ You should not merge if acceptance tests fail to pass. ⚠️

Happy hacking!

@srbarrios srbarrios force-pushed the qe-fix-gh-validation-reposync branch from a6b6f03 to 99d7923 Compare October 23, 2023 12:36
@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/7740/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/7740/checks.
See the troubleshooting guide if you need any help.

⚠️ You should not merge if acceptance tests fail to pass. ⚠️

Happy hacking!

@srbarrios srbarrios force-pushed the qe-fix-gh-validation-reposync branch from 99d7923 to cb18e78 Compare October 23, 2023 12:38
@github-actions
Copy link
Contributor

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take same time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/7740/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/7740/checks.
See the troubleshooting guide if you need any help.

⚠️ You should not merge if acceptance tests fail to pass. ⚠️

Happy hacking!

@srbarrios
Copy link
Member Author

In order to fix it, we first need a new Docker image, that will contain the Deb Test packages.
Jordi will generate it.

Basically, we need these changes:

diff --git a/testsuite/dockerfiles/server-all-in-one-dev/Dockerfile b/testsuite/dockerfiles/server-all-in-one-dev/Dockerfile
index 62f346989d6..288366ae0bc 100644
--- a/testsuite/dockerfiles/server-all-in-one-dev/Dockerfile
+++ b/testsuite/dockerfiles/server-all-in-one-dev/Dockerfile
@@ -25,8 +25,9 @@ RUN mkdir /tmp/minima && \
     tar zxvf minima-linux-amd64.tar.gz && \
     cp minima /usr/bin/minima
 RUN /usr/bin/minima sync -c /etc/minima.yaml && \
-    mv /srv/www/htdocs/pub/TestRepoRpmUpdates/repositories/systemsmanagement\:/Uyuni\:/Test-Packages\:/Updates/rpm/* /srv/www/htdocs/pub/TestRepoRpmUpdates/ && \
-   rm -rf /srv/www/htdocs/pub/TestRepoRpmUpdates/repositories/
+    mv /srv/www/htdocs/pub/TestRepoRpmUpdates/repositories/systemsmanagement\:/Uyuni\:/Test-Packages\:/Updates/rpm /srv/www/htdocs/pub/TestRepoRpmUpdates/ && \
+    rm -rf /srv/www/htdocs/pub/TestRepoRpmUpdates/repositories/ \
+    mv /srv/www/htdocs/pub/TestRepoDebUpdates/repositories/systemsmanagement\:/Uyuni\:/Test-Packages\:/Updates/deb /srv/www/htdocs/pub/TestRepoDebUpdates/ && \
+    rm -rf /srv/www/htdocs/pub/TestRepoDebUpdates/repositories/
 RUN cd /srv/www/htdocs/pub && ln -s TestRepoRpmUpdates AnotherRepo
 RUN mkdir /etc/pki/rpm-gpg && wget -c http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/repodata/repomd.xml.key -O  /etc/pki/rpm-gpg/uyuni-tools-gpg-pubkey-0d20833e.key
-
diff --git a/testsuite/dockerfiles/server-all-in-one-dev/minima.yaml b/testsuite/dockerfiles/server-all-in-one-dev/minima.yaml
index 7f4a8c37834..4060bb260a7 100644
--- a/testsuite/dockerfiles/server-all-in-one-dev/minima.yaml
+++ b/testsuite/dockerfiles/server-all-in-one-dev/minima.yaml
@@ -1,6 +1,7 @@
 storage:
   type: file
-  path: /srv/www/htdocs/pub/TestRepoRpmUpdates
+  path: /srv/www/htdocs/pub/
 
 http:
   - url: http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/rpm
+  - url: http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb

@srbarrios srbarrios force-pushed the qe-fix-gh-validation-reposync branch from cb18e78 to dbcd17b Compare October 24, 2023 10:52
@srbarrios
Copy link
Member Author

After a discussion with @jordimassaguerpla we can't generate the new container image yet, as we need to fix other previous issues related with the upgrade to 15.5.
Therefore, for now, we will disable Debian-like related scenarios from the GH validation.

@srbarrios srbarrios marked this pull request as ready for review October 24, 2023 12:22
@srbarrios srbarrios requested a review from a team as a code owner October 24, 2023 12:22
@srbarrios srbarrios merged commit 89609a7 into master Oct 24, 2023
10 of 11 checks passed
@srbarrios srbarrios deleted the qe-fix-gh-validation-reposync branch October 24, 2023 12:22
r-richardson pushed a commit to r-richardson/uyuni that referenced this pull request Oct 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants