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

Update ci to f34 #4244

Merged
merged 10 commits into from
Sep 6, 2021
Merged

Update ci to f34 #4244

merged 10 commits into from
Sep 6, 2021

Conversation

AdamSaleh
Copy link
Contributor

Update vagrant env and Dockerfiles to use f34 and make changes to CI and mergify

@AdamSaleh AdamSaleh requested a review from a team as a code owner August 10, 2021 11:53
@AdamSaleh AdamSaleh mentioned this pull request Aug 10, 2021
@@ -161,16 +161,16 @@ node('bodhi') {

try {
parallel(
f32: {test_release('f32')},
f33: {test_release('f33')},
f33: {test_release('f32')},
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be
f33: {test_release('f33')}, f34: {test_release('f34')},
?

Copy link
Contributor

Choose a reason for hiding this comment

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

Proposed changes:
LenkaSeg@93b432c

@AdamSaleh AdamSaleh force-pushed the update_ci_to_f34 branch 2 times, most recently from 0903aee to d684412 Compare September 3, 2021 12:15
@@ -1,7 +1,10 @@
FROM registry.fedoraproject.org/fedora:rawhide
FROM registry.fedoraproject.org/fedora:35
Copy link
Contributor

Choose a reason for hiding this comment

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

This does not seems correct, since rawhide is now f36. We should keep the rawhide label.

@@ -1,4 +1,4 @@
FROM bodhi-ci/f32
FROM bodhi-ci/f34
Copy link
Contributor

Choose a reason for hiding this comment

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

should probably rename the file too

@@ -28,5 +24,3 @@ PyYAML
simplemediawiki
sqlalchemy
waitress
WebOb-GraphQL
whitenoise
Copy link
Contributor

Choose a reason for hiding this comment

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

I think whitenoise is used to serve the docs so we should keep it.

jinja2
markdown>=3.0
prometheus_client
Copy link
Contributor

Choose a reason for hiding this comment

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

These 2 should probably still be there

@@ -10,12 +10,8 @@ dogpile.cache
pyasn1-modules # Due to an unfortunate dash in its name, installs break if pyasn1 is installed first
fedora_messaging
feedgen>=0.7.0
graphene
graphene-sqlalchemy
koji
Copy link
Contributor

Choose a reason for hiding this comment

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

Pretty sure we still want to have koji here :)

@@ -1,4 +1,4 @@
FROM bodhi-ci/f32
FROM bodhi-ci/f34
Copy link
Contributor

Choose a reason for hiding this comment

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

You will need to change

RUN python3 setup.py build && pip3 install --no-use-pep517 . && pip3 install koji

with

RUN python3 setup.py bdist_wheel && pip3 install ./dist/*.whl && pip3 install koji

to fix f34-integration-build

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, also add python3-wheel to dnf install command, see 6f5d36d

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done and done. f34-integration-build works now, thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

You're welcome.

For the f32-* tests which are always required, I think there is a setting at project level in github that can only be changed by an admin... unfortunately, removing them from mergify config isn't enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Found that setting as well. You think this looks good enough? I'd really like to merge this and then start looking at some of the stale PR's we have around the place, with the work of fixing and refactoring the integration tests to be postponed to a later date.

@AdamSaleh AdamSaleh force-pushed the update_ci_to_f34 branch 2 times, most recently from 1a99b70 to 0b0d353 Compare September 6, 2021 14:15
humaton and others added 10 commits September 6, 2021 16:43
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
Signed-off-by: Adam Saleh <asaleh@redhat.com>
Signed-off-by: Adam Saleh <asaleh@redhat.com>
…ds a new query allReleases that allows to fetch all Release objects from the database using GraphQL. Fixes fedora-infra#4024."

This reverts commit 84fdcb4.

Signed-off-by: Adam Saleh <asaleh@redhat.com>
This reverts commit fe46499.

Signed-off-by: Adam Saleh <asaleh@redhat.com>
Signed-off-by: Adam Saleh <asaleh@redhat.com>
Fix test failure with unescaped sphinx version pin
Disable repo that fails with rawhide integration build
Remove rawhide from CI due to issue on jenkins builder
Fixe mypy by installing additional types-* packages

Signed-off-by: Adam Saleh <asaleh@redhat.com>
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
Signed-off-by: Adam Saleh <asaleh@redhat.com>
Copy link
Contributor

@mattiaverga mattiaverga left a comment

Choose a reason for hiding this comment

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

LGTM Thank you!

@fedora-infra fedora-infra deleted a comment from mergify bot Sep 6, 2021
@AdamSaleh AdamSaleh merged commit 1d9cecb into fedora-infra:develop Sep 6, 2021
@Zlopez Zlopez mentioned this pull request Sep 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants