Skip to content

Commit

Permalink
Add back python build to amazonlinux 20203
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Nov 23, 2024
1 parent 92e7c15 commit fe22ebc
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ will be commited.
### [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)

- testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
- testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
- testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
- testing:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
Expand All @@ -110,6 +111,7 @@ will be commited.
- testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
- testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
- testing:systemd-amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2`
- testing:systemd-amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2023`
- testing:systemd-debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-11`
- testing:systemd-debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-12`
- testing:systemd-photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5`
Expand Down
4 changes: 2 additions & 2 deletions containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ custom:
- fedora-40
- amazonlinux-2
- systemd-amazonlinux-2
# - amazonlinux-2023
# - systemd-amazonlinux-2023
- amazonlinux-2023
- systemd-amazonlinux-2023

# <---- Custom Containers ---------------------------------------------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions custom/testing/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)

- testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
- testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
- testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
- testing:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
Expand All @@ -9,6 +10,7 @@
- testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
- testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
- testing:systemd-amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2`
- testing:systemd-amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2023`
- testing:systemd-debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-11`
- testing:systemd-debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-12`
- testing:systemd-photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5`
Expand Down
2 changes: 1 addition & 1 deletion custom/testing/amazonlinux-2023.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN <<EOF
tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz

# Python does not compile in a timely manner on amazon2023 and fedora40 arm64
# ./salt/salt-call --log-level=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
./salt/salt-call --log-level=debug --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision

rm -rf salt
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
Expand Down
2 changes: 1 addition & 1 deletion custom/testing/golden-state-tree/os/amazon2023/init.sls
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include:
- .config
- .pkgs
{# - python #}
- python

0 comments on commit fe22ebc

Please sign in to comment.