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

ci: add fedora-37 & fedora-38 #1840

Merged
merged 5 commits into from
Dec 9, 2022

Conversation

myii
Copy link
Contributor

@myii myii commented Jun 30, 2022

What does this PR do?

Fedora 37 packages are available at the Fedora Updates System, so adding it to the CI here.

The other commit is replacing the Python 3.10 specific pyzmq package on Tumbleweed with the virtual one -- as suggested by @agraul when discussing the situation on Slack.

saltstack-formulas-github pushed a commit to netmanagers/salt-image-builder that referenced this pull request Jun 30, 2022
CI addition proposed to the `salt-bootstrap` repo (already tested):

* saltstack/salt-bootstrap#1840
@myii
Copy link
Contributor Author

myii commented Jul 5, 2022

This was working back in late June when I tried it:

However, now held up by the update to Python 3.11:

Error: 
 Problem: conflicting requests
  - nothing provides python(abi) = 3.10 needed by python3-m2crypto-0.38.0-2.fc35.x86_64
(try to add '--skip-broken' to skip uninstallable packages)
 * ERROR: Failed to run install_fedora_deps()!!!

As mentioned in point 5 at https://fedoraproject.org/wiki/Changes/Python3.11#Scope:

  1. Mass rebuild all the packages that runtime require python(abi) = 3.10 and/or libpython3.10.so.1.0 (~3800 known packages in October 2021)

Copy link

@agraul agraul left a comment

Choose a reason for hiding this comment

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

The TW related change looks good!

@garethgreenaway
Copy link
Contributor

@myii Looks like you've got a merge conflict here.

@myii myii force-pushed the ci/add-fedora-37 branch from a91386b to 705dc7b Compare December 9, 2022 07:23
@myii
Copy link
Contributor Author

myii commented Dec 9, 2022

Rebased this PR and added Fedora 38 as well, as discussed with @garethgreenaway in Slack. Included a temporary commit to avoid git builds on Fedora 37+ for now, until those are fixed.

Short overview showing the two new instances added to the matrix:


In terms of the failures, looks like it's due to a setuptools deprecation:

/usr/lib/python3.11/site-packages/setuptools/command/install.py:34: SetuptoolsDeprecationWarning: setup.py install is deprecated. Use build and pip and other standards-based tools.

Which refers back to this section:

  • if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
    ${_PYEXE} setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1
    else
    ${_PYEXE} setup.py ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1
    fi

The working version of setuptools on Fedora 36:

python3-setuptools             noarch     59.6.0-3.fc36      updates     934 k

While the version on Fedora 37 is:

python3-setuptools             noarch     62.6.0-2.fc37      fedora      1.6 M

Just looking through the Salt repo, the workaround there appears to be to pin the version of setuptools:

That's not a long-term solution, though -- so eventually going to have to do what the message says:

Use build and pip and other standards-based tools.

@myii myii changed the title ci(fedora-37): add platform ci: add fedora-37 & fedora-38 Dec 9, 2022
@garethgreenaway garethgreenaway merged commit 9133a6e into saltstack:develop Dec 9, 2022
@myii myii deleted the ci/add-fedora-37 branch December 9, 2022 17:57
saltstack-formulas-github pushed a commit to netmanagers/salt-image-builder that referenced this pull request Dec 12, 2022
CI addition merged into the `salt-bootstrap` repo:

* saltstack/salt-bootstrap#1840
saltstack-formulas-github pushed a commit to netmanagers/salt-image-builder that referenced this pull request Dec 12, 2022
Installation not currently working with the `salt-bootstrap`:

* saltstack/salt-bootstrap#1840 (comment)
saltstack-formulas-github pushed a commit to netmanagers/salt-image-builder that referenced this pull request Dec 12, 2022
# [1.77.0](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/compare/v1.76.0...v1.77.0) (2022-12-12)

### Features

* **arch:** add package `python-jmespath` for `stable` build ([f34a5c0](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/f34a5c078d256a07f5432a682529a76f8cbe53ef))
* **dockerfile.*:** ensure packages are cleaned up after installation ([0acbb40](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/0acbb405832b7ef697a5dff72f48e06b3e1a2081))
* **dockerfile.*:** remove Tiamat `if` block since no longer needed ([c398085](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/c3980859337c2505f31fcd781bd12defa9536ce0))
* **fedora:** avoid `git`-based installs on Fedora 37+ ([2153363](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/2153363c8998da49eaf00c64b80114d0988d80b3)), closes [/github.com/saltstack/salt-bootstrap/pull/1840#issuecomment-1343953989](https://gitlab.com//github.com/saltstack/salt-bootstrap/pull/1840/issues/issuecomment-1343953989)
* **gentoo:** disable `3005.1` instanced until failures resolved ([9f9c96a](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/9f9c96a472d54b874b459728619b1e9d2ad8e109))
* **gitlab-ci:** add `fedora-38` ([c8665c7](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/c8665c77e3fb7a28ee077bb98200be3b787b6322))
* **gitlab-ci:** build `onedir 3005.1` images ([ca50336](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/ca503369695ddf7bbe201945a2b0d5d6729a1504))
* **gitlab-ci:** build `onedir nightly` images ([138bd1c](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/138bd1c2416d5f28c1a8640536f596cae3093c15))
* **gitlab-ci:** deprecate `3003.5` ([f99eb08](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/f99eb0832bdc8ad5458c1c69a894e2d91e21eb42))
* **gitlab-ci:** deprecate `debian-9` (EOL) ([d9a5565](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/d9a5565f0dcc8634aa159d1c8f58278c86181e32))
* **onedir:** perform `tiamat` => `onedir` replacement (not 1:1) ([174b856](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/174b8566016a603724fc8ea86439af93c367c3a0))
* **onedir:** remove extra package `python3-pip` (Debian-based) ([946d805](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/946d805378fbf8aec2339291f2254cac9897c13f))
* **onedir:** remove extra package `python3-pip` (RedHat-based) ([1721fd8](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/1721fd89d998a17b39314562c7160f7f2739166f))
* **phosphorus:** add `3005.1` ([a6111aa](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/a6111aacb9237cb12c65336a52f1cb07cb3511cf))

### Styles

* **dockerfile.*:** use consistent disable Salt service comment ([0749ee2](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/0749ee26124d89531831efd4222f203172213c99))
* **gitlab-ci:** adjust spacing for upcoming `SV: 'nightly'` ([fc5d18c](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/fc5d18c069bd6d57018d9cfe022efd4e5c044d71))

### Tests

* **reqs:** check for `salt-pip` instead of `pip` for `onedir` ([347253a](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/347253a636e7fd13a033f47e455ac0b8e9bbe319))
* **salt_version:** expand `major_minor` to allow ending in `.x` ([0242f33](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/0242f33c26993db26ff01b6816e77e145ad7d0be))
* **salt_version:** refactor to make DRY using `major_minor` ([2644661](https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/commit/26446613263befa8cb406b729296f692450f5cd3))
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.

3 participants