From 03bac7e4286cc78d92d8f9a4e75a8033c57cf280 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 18 Nov 2024 12:52:53 -0700 Subject: [PATCH 1/7] Add python state back to fedora --- .github/workflows/.container.template.j2 | 4 ++-- .github/workflows/amazonlinux-containers.yml | 4 ++-- .github/workflows/archlinux-containers.yml | 4 ++-- .github/workflows/builddocs-containers.yml | 4 ++-- .github/workflows/busybox-containers.yml | 4 ++-- .github/workflows/consul-containers.yml | 4 ++-- .github/workflows/debian-containers.yml | 4 ++-- .github/workflows/etcd-v2-containers.yml | 4 ++-- .github/workflows/etcd-v3-containers.yml | 4 ++-- .github/workflows/fedora-containers.yml | 4 ++-- .github/workflows/mariadb-containers.yml | 4 ++-- .github/workflows/mysql-server-containers.yml | 4 ++-- .../workflows/openldap-minion-containers.yml | 4 ++-- .github/workflows/opensuse-containers.yml | 4 ++-- .github/workflows/packaging-containers.yml | 4 ++-- .github/workflows/percona-containers.yml | 4 ++-- .github/workflows/photon-containers.yml | 4 ++-- .github/workflows/python-containers.yml | 4 ++-- .github/workflows/rabbitmq-containers.yml | 4 ++-- .github/workflows/redis-containers.yml | 4 ++-- .github/workflows/rockylinux-containers.yml | 4 ++-- .github/workflows/salt-containers.yml | 4 ++-- .../workflows/salt-gitfs-http-containers.yml | 4 ++-- .github/workflows/ssh-minion-containers.yml | 4 ++-- .github/workflows/testing-containers.yml | 4 ++-- .github/workflows/tinyproxy-containers.yml | 4 ++-- .github/workflows/ubuntu-containers.yml | 4 ++-- .github/workflows/vault-containers.yml | 4 ++-- .github/workflows/virt-minion-containers.yml | 4 ++-- .github/workflows/zookeeper-containers.yml | 4 ++-- .../golden-state-tree/os/fedora/init.sls | 2 +- .../python/fedora_dependencies.sls | 18 +++++++++--------- 32 files changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2 index b7552c2..a4f6e9f 100644 --- a/.github/workflows/.container.template.j2 +++ b/.github/workflows/.container.template.j2 @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/<{ workflow_file_name }>' - - '<{ repository_path }>/*' + - '<{ repository_path }>/**' pull_request: paths: - containers.yml - '.github/workflows/<{ workflow_file_name }>' - - '<{ repository_path }>/*' + - '<{ repository_path }>/**' env: COLUMNS: 190 diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml index 6a01714..e93bc69 100644 --- a/.github/workflows/amazonlinux-containers.yml +++ b/.github/workflows/amazonlinux-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/amazonlinux-containers.yml' - - 'mirrors/amazonlinux/*' + - 'mirrors/amazonlinux/**' pull_request: paths: - containers.yml - '.github/workflows/amazonlinux-containers.yml' - - 'mirrors/amazonlinux/*' + - 'mirrors/amazonlinux/**' env: COLUMNS: 190 diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml index 8ab5ae5..96cbb7f 100644 --- a/.github/workflows/archlinux-containers.yml +++ b/.github/workflows/archlinux-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/archlinux-containers.yml' - - 'mirrors/archlinux/*' + - 'mirrors/archlinux/**' pull_request: paths: - containers.yml - '.github/workflows/archlinux-containers.yml' - - 'mirrors/archlinux/*' + - 'mirrors/archlinux/**' env: COLUMNS: 190 diff --git a/.github/workflows/builddocs-containers.yml b/.github/workflows/builddocs-containers.yml index e3e90c9..8343e82 100644 --- a/.github/workflows/builddocs-containers.yml +++ b/.github/workflows/builddocs-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/builddocs-containers.yml' - - 'custom/builddocs/*' + - 'custom/builddocs/**' pull_request: paths: - containers.yml - '.github/workflows/builddocs-containers.yml' - - 'custom/builddocs/*' + - 'custom/builddocs/**' env: COLUMNS: 190 diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml index 88238d6..a4352bb 100644 --- a/.github/workflows/busybox-containers.yml +++ b/.github/workflows/busybox-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/busybox-containers.yml' - - 'mirrors/busybox/*' + - 'mirrors/busybox/**' pull_request: paths: - containers.yml - '.github/workflows/busybox-containers.yml' - - 'mirrors/busybox/*' + - 'mirrors/busybox/**' env: COLUMNS: 190 diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml index dbda633..13def2e 100644 --- a/.github/workflows/consul-containers.yml +++ b/.github/workflows/consul-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/consul-containers.yml' - - 'mirrors/consul/*' + - 'mirrors/consul/**' pull_request: paths: - containers.yml - '.github/workflows/consul-containers.yml' - - 'mirrors/consul/*' + - 'mirrors/consul/**' env: COLUMNS: 190 diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml index c0c0e5d..c44a47a 100644 --- a/.github/workflows/debian-containers.yml +++ b/.github/workflows/debian-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/debian-containers.yml' - - 'mirrors/debian/*' + - 'mirrors/debian/**' pull_request: paths: - containers.yml - '.github/workflows/debian-containers.yml' - - 'mirrors/debian/*' + - 'mirrors/debian/**' env: COLUMNS: 190 diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml index da7acc0..fa3281f 100644 --- a/.github/workflows/etcd-v2-containers.yml +++ b/.github/workflows/etcd-v2-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/etcd-v2-containers.yml' - - 'mirrors/etcd-v2/*' + - 'mirrors/etcd-v2/**' pull_request: paths: - containers.yml - '.github/workflows/etcd-v2-containers.yml' - - 'mirrors/etcd-v2/*' + - 'mirrors/etcd-v2/**' env: COLUMNS: 190 diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml index debf06a..f3d29cf 100644 --- a/.github/workflows/etcd-v3-containers.yml +++ b/.github/workflows/etcd-v3-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/etcd-v3-containers.yml' - - 'mirrors/etcd-v3/*' + - 'mirrors/etcd-v3/**' pull_request: paths: - containers.yml - '.github/workflows/etcd-v3-containers.yml' - - 'mirrors/etcd-v3/*' + - 'mirrors/etcd-v3/**' env: COLUMNS: 190 diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml index a0887a7..c68b0d4 100644 --- a/.github/workflows/fedora-containers.yml +++ b/.github/workflows/fedora-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/fedora-containers.yml' - - 'mirrors/fedora/*' + - 'mirrors/fedora/**' pull_request: paths: - containers.yml - '.github/workflows/fedora-containers.yml' - - 'mirrors/fedora/*' + - 'mirrors/fedora/**' env: COLUMNS: 190 diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml index 2035d2f..3ad6f5d 100644 --- a/.github/workflows/mariadb-containers.yml +++ b/.github/workflows/mariadb-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/mariadb-containers.yml' - - 'mirrors/mariadb/*' + - 'mirrors/mariadb/**' pull_request: paths: - containers.yml - '.github/workflows/mariadb-containers.yml' - - 'mirrors/mariadb/*' + - 'mirrors/mariadb/**' env: COLUMNS: 190 diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml index 0d42567..fede024 100644 --- a/.github/workflows/mysql-server-containers.yml +++ b/.github/workflows/mysql-server-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/mysql-server-containers.yml' - - 'mirrors/mysql-server/*' + - 'mirrors/mysql-server/**' pull_request: paths: - containers.yml - '.github/workflows/mysql-server-containers.yml' - - 'mirrors/mysql-server/*' + - 'mirrors/mysql-server/**' env: COLUMNS: 190 diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml index 6247bf7..f8c010e 100644 --- a/.github/workflows/openldap-minion-containers.yml +++ b/.github/workflows/openldap-minion-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/openldap-minion-containers.yml' - - 'custom/openldap-minion/*' + - 'custom/openldap-minion/**' pull_request: paths: - containers.yml - '.github/workflows/openldap-minion-containers.yml' - - 'custom/openldap-minion/*' + - 'custom/openldap-minion/**' env: COLUMNS: 190 diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml index 12035d5..164dfce 100644 --- a/.github/workflows/opensuse-containers.yml +++ b/.github/workflows/opensuse-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/opensuse-containers.yml' - - 'mirrors/opensuse/*' + - 'mirrors/opensuse/**' pull_request: paths: - containers.yml - '.github/workflows/opensuse-containers.yml' - - 'mirrors/opensuse/*' + - 'mirrors/opensuse/**' env: COLUMNS: 190 diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml index 6f6b3f0..80e7576 100644 --- a/.github/workflows/packaging-containers.yml +++ b/.github/workflows/packaging-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/packaging-containers.yml' - - 'custom/packaging/*' + - 'custom/packaging/**' pull_request: paths: - containers.yml - '.github/workflows/packaging-containers.yml' - - 'custom/packaging/*' + - 'custom/packaging/**' env: COLUMNS: 190 diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml index c6144f6..9791548 100644 --- a/.github/workflows/percona-containers.yml +++ b/.github/workflows/percona-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/percona-containers.yml' - - 'mirrors/percona/*' + - 'mirrors/percona/**' pull_request: paths: - containers.yml - '.github/workflows/percona-containers.yml' - - 'mirrors/percona/*' + - 'mirrors/percona/**' env: COLUMNS: 190 diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml index 8c9a82e..6092505 100644 --- a/.github/workflows/photon-containers.yml +++ b/.github/workflows/photon-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/photon-containers.yml' - - 'mirrors/photon/*' + - 'mirrors/photon/**' pull_request: paths: - containers.yml - '.github/workflows/photon-containers.yml' - - 'mirrors/photon/*' + - 'mirrors/photon/**' env: COLUMNS: 190 diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml index 53aa288..2d619b8 100644 --- a/.github/workflows/python-containers.yml +++ b/.github/workflows/python-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/python-containers.yml' - - 'mirrors/python/*' + - 'mirrors/python/**' pull_request: paths: - containers.yml - '.github/workflows/python-containers.yml' - - 'mirrors/python/*' + - 'mirrors/python/**' env: COLUMNS: 190 diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml index d2af278..eb16fa0 100644 --- a/.github/workflows/rabbitmq-containers.yml +++ b/.github/workflows/rabbitmq-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/rabbitmq-containers.yml' - - 'mirrors/rabbitmq/*' + - 'mirrors/rabbitmq/**' pull_request: paths: - containers.yml - '.github/workflows/rabbitmq-containers.yml' - - 'mirrors/rabbitmq/*' + - 'mirrors/rabbitmq/**' env: COLUMNS: 190 diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml index 74eeb90..a60351d 100644 --- a/.github/workflows/redis-containers.yml +++ b/.github/workflows/redis-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/redis-containers.yml' - - 'mirrors/redis/*' + - 'mirrors/redis/**' pull_request: paths: - containers.yml - '.github/workflows/redis-containers.yml' - - 'mirrors/redis/*' + - 'mirrors/redis/**' env: COLUMNS: 190 diff --git a/.github/workflows/rockylinux-containers.yml b/.github/workflows/rockylinux-containers.yml index 3edc171..3c02acf 100644 --- a/.github/workflows/rockylinux-containers.yml +++ b/.github/workflows/rockylinux-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/rockylinux-containers.yml' - - 'mirrors/rockylinux/*' + - 'mirrors/rockylinux/**' pull_request: paths: - containers.yml - '.github/workflows/rockylinux-containers.yml' - - 'mirrors/rockylinux/*' + - 'mirrors/rockylinux/**' env: COLUMNS: 190 diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml index 65aa971..eb7a010 100644 --- a/.github/workflows/salt-containers.yml +++ b/.github/workflows/salt-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/salt-containers.yml' - - 'salt/*' + - 'salt/**' pull_request: paths: - containers.yml - '.github/workflows/salt-containers.yml' - - 'salt/*' + - 'salt/**' env: COLUMNS: 190 diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml index 7d82099..9d02873 100644 --- a/.github/workflows/salt-gitfs-http-containers.yml +++ b/.github/workflows/salt-gitfs-http-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/salt-gitfs-http-containers.yml' - - 'custom/salt-gitfs-http/*' + - 'custom/salt-gitfs-http/**' pull_request: paths: - containers.yml - '.github/workflows/salt-gitfs-http-containers.yml' - - 'custom/salt-gitfs-http/*' + - 'custom/salt-gitfs-http/**' env: COLUMNS: 190 diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml index a689c68..b2393c3 100644 --- a/.github/workflows/ssh-minion-containers.yml +++ b/.github/workflows/ssh-minion-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/ssh-minion-containers.yml' - - 'custom/ssh-minion/*' + - 'custom/ssh-minion/**' pull_request: paths: - containers.yml - '.github/workflows/ssh-minion-containers.yml' - - 'custom/ssh-minion/*' + - 'custom/ssh-minion/**' env: COLUMNS: 190 diff --git a/.github/workflows/testing-containers.yml b/.github/workflows/testing-containers.yml index ebd1bc2..fba5e18 100644 --- a/.github/workflows/testing-containers.yml +++ b/.github/workflows/testing-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/testing-containers.yml' - - 'custom/testing/*' + - 'custom/testing/**' pull_request: paths: - containers.yml - '.github/workflows/testing-containers.yml' - - 'custom/testing/*' + - 'custom/testing/**' env: COLUMNS: 190 diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml index f466b94..c4a2e50 100644 --- a/.github/workflows/tinyproxy-containers.yml +++ b/.github/workflows/tinyproxy-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/tinyproxy-containers.yml' - - 'mirrors/tinyproxy/*' + - 'mirrors/tinyproxy/**' pull_request: paths: - containers.yml - '.github/workflows/tinyproxy-containers.yml' - - 'mirrors/tinyproxy/*' + - 'mirrors/tinyproxy/**' env: COLUMNS: 190 diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml index 3c4bdd1..4dbe359 100644 --- a/.github/workflows/ubuntu-containers.yml +++ b/.github/workflows/ubuntu-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/ubuntu-containers.yml' - - 'mirrors/ubuntu/*' + - 'mirrors/ubuntu/**' pull_request: paths: - containers.yml - '.github/workflows/ubuntu-containers.yml' - - 'mirrors/ubuntu/*' + - 'mirrors/ubuntu/**' env: COLUMNS: 190 diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml index c350f9e..d7445e2 100644 --- a/.github/workflows/vault-containers.yml +++ b/.github/workflows/vault-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/vault-containers.yml' - - 'mirrors/vault/*' + - 'mirrors/vault/**' pull_request: paths: - containers.yml - '.github/workflows/vault-containers.yml' - - 'mirrors/vault/*' + - 'mirrors/vault/**' env: COLUMNS: 190 diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml index 0486db1..e0aeabc 100644 --- a/.github/workflows/virt-minion-containers.yml +++ b/.github/workflows/virt-minion-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/virt-minion-containers.yml' - - 'custom/virt-minion/*' + - 'custom/virt-minion/**' pull_request: paths: - containers.yml - '.github/workflows/virt-minion-containers.yml' - - 'custom/virt-minion/*' + - 'custom/virt-minion/**' env: COLUMNS: 190 diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml index a1af6e8..ce8b999 100644 --- a/.github/workflows/zookeeper-containers.yml +++ b/.github/workflows/zookeeper-containers.yml @@ -10,12 +10,12 @@ on: paths: - containers.yml - '.github/workflows/zookeeper-containers.yml' - - 'mirrors/zookeeper/*' + - 'mirrors/zookeeper/**' pull_request: paths: - containers.yml - '.github/workflows/zookeeper-containers.yml' - - 'mirrors/zookeeper/*' + - 'mirrors/zookeeper/**' env: COLUMNS: 190 diff --git a/custom/testing/golden-state-tree/os/fedora/init.sls b/custom/testing/golden-state-tree/os/fedora/init.sls index 788a212..08e768b 100644 --- a/custom/testing/golden-state-tree/os/fedora/init.sls +++ b/custom/testing/golden-state-tree/os/fedora/init.sls @@ -1,4 +1,4 @@ include: - .config - .pkgs -{# - python #} + - python diff --git a/custom/testing/golden-state-tree/python/fedora_dependencies.sls b/custom/testing/golden-state-tree/python/fedora_dependencies.sls index 8a23685..9310f43 100644 --- a/custom/testing/golden-state-tree/python/fedora_dependencies.sls +++ b/custom/testing/golden-state-tree/python/fedora_dependencies.sls @@ -3,23 +3,23 @@ python_dependencies: - pkgs: - gcc - make - {#- - - findutils - - binutils - - coreutils - - autoconf - - autoconf-archive - - pkgconf - openssl-devel + {#- - libffi-devel - bzip2-devel - - zlib-ng-compat-devel - libuuid-devel - readline-devel - ncurses-devel - - gdbm-devel - sqlite-devel + - gdbm-devel - xz-devel + - findutils + - binutils + - coreutils + - autoconf + - autoconf-archive + - pkgconf + - zlib-ng-compat-devel - libnsl2-devel - expat-devel #} From 9a889066056792cce99693887e4a5f4e20108c24 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 19 Nov 2024 17:32:29 -0700 Subject: [PATCH 2/7] Debug --- custom/testing/fedora-40.Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile index 07b3d33..9819887 100644 --- a/custom/testing/fedora-40.Dockerfile +++ b/custom/testing/fedora-40.Dockerfile @@ -20,7 +20,12 @@ RUN < Date: Wed, 20 Nov 2024 15:32:47 -0700 Subject: [PATCH 3/7] Install gcc --- custom/testing/fedora-40.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile index 9819887..1e3c30a 100644 --- a/custom/testing/fedora-40.Dockerfile +++ b/custom/testing/fedora-40.Dockerfile @@ -17,6 +17,8 @@ RUN < Date: Thu, 21 Nov 2024 14:42:48 -0700 Subject: [PATCH 4/7] Add libffi-devel --- custom/testing/fedora-40.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile index 1e3c30a..e9e823f 100644 --- a/custom/testing/fedora-40.Dockerfile +++ b/custom/testing/fedora-40.Dockerfile @@ -17,7 +17,7 @@ RUN < Date: Sat, 23 Nov 2024 14:56:16 -0700 Subject: [PATCH 5/7] Update build step timeout --- .github/workflows/.container.template.j2 | 1 + .github/workflows/amazonlinux-containers.yml | 1 + .github/workflows/archlinux-containers.yml | 1 + .github/workflows/builddocs-containers.yml | 1 + .github/workflows/busybox-containers.yml | 1 + .github/workflows/consul-containers.yml | 2 +- .github/workflows/debian-containers.yml | 1 + .github/workflows/etcd-v2-containers.yml | 1 + .github/workflows/etcd-v3-containers.yml | 1 + .github/workflows/fedora-containers.yml | 1 + .github/workflows/mariadb-containers.yml | 1 + .github/workflows/mysql-server-containers.yml | 1 + .github/workflows/openldap-minion-containers.yml | 1 + .github/workflows/opensuse-containers.yml | 1 + .github/workflows/packaging-containers.yml | 1 + .github/workflows/percona-containers.yml | 1 + .github/workflows/photon-containers.yml | 1 + .github/workflows/python-containers.yml | 1 + .github/workflows/rabbitmq-containers.yml | 1 + .github/workflows/redis-containers.yml | 1 + .github/workflows/rockylinux-containers.yml | 1 + .github/workflows/salt-containers.yml | 1 + .github/workflows/salt-gitfs-http-containers.yml | 1 + .github/workflows/ssh-minion-containers.yml | 1 + .github/workflows/testing-containers.yml | 1 + .github/workflows/tinyproxy-containers.yml | 1 + .github/workflows/ubuntu-containers.yml | 1 + .github/workflows/vault-containers.yml | 1 + .github/workflows/virt-minion-containers.yml | 1 + .github/workflows/zookeeper-containers.yml | 1 + 30 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2 index a4f6e9f..d669052 100644 --- a/.github/workflows/.container.template.j2 +++ b/.github/workflows/.container.template.j2 @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml index e93bc69..a0d4e9e 100644 --- a/.github/workflows/amazonlinux-containers.yml +++ b/.github/workflows/amazonlinux-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml index 96cbb7f..1bc40ca 100644 --- a/.github/workflows/archlinux-containers.yml +++ b/.github/workflows/archlinux-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/builddocs-containers.yml b/.github/workflows/builddocs-containers.yml index 8343e82..a3f0edc 100644 --- a/.github/workflows/builddocs-containers.yml +++ b/.github/workflows/builddocs-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml index a4352bb..2f9b1e9 100644 --- a/.github/workflows/busybox-containers.yml +++ b/.github/workflows/busybox-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml index 13def2e..3838060 100644 --- a/.github/workflows/consul-containers.yml +++ b/.github/workflows/consul-containers.yml @@ -64,8 +64,8 @@ jobs: build: runs-on: ubuntu-latest needs: matrix-generator - timeout-minutes: 600 name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml index c44a47a..9ff8607 100644 --- a/.github/workflows/debian-containers.yml +++ b/.github/workflows/debian-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml index fa3281f..3b8f8ab 100644 --- a/.github/workflows/etcd-v2-containers.yml +++ b/.github/workflows/etcd-v2-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml index f3d29cf..c6a1435 100644 --- a/.github/workflows/etcd-v3-containers.yml +++ b/.github/workflows/etcd-v3-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml index c68b0d4..0ccd0fb 100644 --- a/.github/workflows/fedora-containers.yml +++ b/.github/workflows/fedora-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml index 3ad6f5d..f1cf1d3 100644 --- a/.github/workflows/mariadb-containers.yml +++ b/.github/workflows/mariadb-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml index fede024..2180c95 100644 --- a/.github/workflows/mysql-server-containers.yml +++ b/.github/workflows/mysql-server-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml index f8c010e..b933763 100644 --- a/.github/workflows/openldap-minion-containers.yml +++ b/.github/workflows/openldap-minion-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml index 164dfce..6bd5533 100644 --- a/.github/workflows/opensuse-containers.yml +++ b/.github/workflows/opensuse-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml index 80e7576..752e7ed 100644 --- a/.github/workflows/packaging-containers.yml +++ b/.github/workflows/packaging-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml index 9791548..d0081ee 100644 --- a/.github/workflows/percona-containers.yml +++ b/.github/workflows/percona-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml index 6092505..0c51623 100644 --- a/.github/workflows/photon-containers.yml +++ b/.github/workflows/photon-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml index 2d619b8..4975e0d 100644 --- a/.github/workflows/python-containers.yml +++ b/.github/workflows/python-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml index eb16fa0..a35a0c4 100644 --- a/.github/workflows/rabbitmq-containers.yml +++ b/.github/workflows/rabbitmq-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml index a60351d..348cc29 100644 --- a/.github/workflows/redis-containers.yml +++ b/.github/workflows/redis-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/rockylinux-containers.yml b/.github/workflows/rockylinux-containers.yml index 3c02acf..6bc01be 100644 --- a/.github/workflows/rockylinux-containers.yml +++ b/.github/workflows/rockylinux-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml index eb7a010..cf294d7 100644 --- a/.github/workflows/salt-containers.yml +++ b/.github/workflows/salt-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml index 9d02873..1d281b7 100644 --- a/.github/workflows/salt-gitfs-http-containers.yml +++ b/.github/workflows/salt-gitfs-http-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml index b2393c3..5b2530e 100644 --- a/.github/workflows/ssh-minion-containers.yml +++ b/.github/workflows/ssh-minion-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/testing-containers.yml b/.github/workflows/testing-containers.yml index fba5e18..ab3712f 100644 --- a/.github/workflows/testing-containers.yml +++ b/.github/workflows/testing-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml index c4a2e50..b5bca61 100644 --- a/.github/workflows/tinyproxy-containers.yml +++ b/.github/workflows/tinyproxy-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml index 4dbe359..5a9c8d1 100644 --- a/.github/workflows/ubuntu-containers.yml +++ b/.github/workflows/ubuntu-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml index d7445e2..0ca65cf 100644 --- a/.github/workflows/vault-containers.yml +++ b/.github/workflows/vault-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml index e0aeabc..eb45ab9 100644 --- a/.github/workflows/virt-minion-containers.yml +++ b/.github/workflows/virt-minion-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml index ce8b999..0373e97 100644 --- a/.github/workflows/zookeeper-containers.yml +++ b/.github/workflows/zookeeper-containers.yml @@ -65,6 +65,7 @@ jobs: runs-on: ubuntu-latest needs: matrix-generator name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}" + timeout-minutes: 600 strategy: fail-fast: false max-parallel: 10 From fe22ebc4612bf709d07373bc7391af5e6b17de93 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 23 Nov 2024 15:23:30 -0700 Subject: [PATCH 6/7] Add back python build to amazonlinux 20203 --- README.md | 2 ++ containers.yml | 4 ++-- custom/testing/README.md | 2 ++ custom/testing/amazonlinux-2023.Dockerfile | 2 +- custom/testing/golden-state-tree/os/amazon2023/init.sls | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c6fc42c..95e7a65 100644 --- a/README.md +++ b/README.md @@ -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` @@ -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` diff --git a/containers.yml b/containers.yml index 48786b9..6af2224 100644 --- a/containers.yml +++ b/containers.yml @@ -64,8 +64,8 @@ custom: - fedora-40 - amazonlinux-2 - systemd-amazonlinux-2 - # - amazonlinux-2023 - # - systemd-amazonlinux-2023 + - amazonlinux-2023 + - systemd-amazonlinux-2023 # <---- Custom Containers --------------------------------------------------------------------------------- diff --git a/custom/testing/README.md b/custom/testing/README.md index a9b09b4..d796e04 100644 --- a/custom/testing/README.md +++ b/custom/testing/README.md @@ -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` @@ -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` diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile index a9f97c0..766db1f 100644 --- a/custom/testing/amazonlinux-2023.Dockerfile +++ b/custom/testing/amazonlinux-2023.Dockerfile @@ -21,7 +21,7 @@ RUN < Date: Mon, 25 Nov 2024 13:58:11 -0700 Subject: [PATCH 7/7] Use enterpirse runner for increased timeout --- .github/workflows/.container.template.j2 | 2 +- .github/workflows/amazonlinux-containers.yml | 2 +- .github/workflows/archlinux-containers.yml | 2 +- .github/workflows/builddocs-containers.yml | 2 +- .github/workflows/busybox-containers.yml | 2 +- .github/workflows/consul-containers.yml | 2 +- .github/workflows/debian-containers.yml | 2 +- .github/workflows/etcd-v2-containers.yml | 2 +- .github/workflows/etcd-v3-containers.yml | 2 +- .github/workflows/fedora-containers.yml | 2 +- .github/workflows/mariadb-containers.yml | 2 +- .github/workflows/mysql-server-containers.yml | 2 +- .github/workflows/openldap-minion-containers.yml | 2 +- .github/workflows/opensuse-containers.yml | 2 +- .github/workflows/packaging-containers.yml | 2 +- .github/workflows/percona-containers.yml | 2 +- .github/workflows/photon-containers.yml | 2 +- .github/workflows/python-containers.yml | 2 +- .github/workflows/rabbitmq-containers.yml | 2 +- .github/workflows/redis-containers.yml | 2 +- .github/workflows/rockylinux-containers.yml | 2 +- .github/workflows/salt-containers.yml | 2 +- .github/workflows/salt-gitfs-http-containers.yml | 2 +- .github/workflows/ssh-minion-containers.yml | 2 +- .github/workflows/testing-containers.yml | 2 +- .github/workflows/tinyproxy-containers.yml | 2 +- .github/workflows/ubuntu-containers.yml | 2 +- .github/workflows/vault-containers.yml | 2 +- .github/workflows/virt-minion-containers.yml | 2 +- .github/workflows/zookeeper-containers.yml | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2 index d669052..55310cb 100644 --- a/.github/workflows/.container.template.j2 +++ b/.github/workflows/.container.template.j2 @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml index a0d4e9e..5940da9 100644 --- a/.github/workflows/amazonlinux-containers.yml +++ b/.github/workflows/amazonlinux-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml index 1bc40ca..19e6aa0 100644 --- a/.github/workflows/archlinux-containers.yml +++ b/.github/workflows/archlinux-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/builddocs-containers.yml b/.github/workflows/builddocs-containers.yml index a3f0edc..b46cdd5 100644 --- a/.github/workflows/builddocs-containers.yml +++ b/.github/workflows/builddocs-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml index 2f9b1e9..67346a4 100644 --- a/.github/workflows/busybox-containers.yml +++ b/.github/workflows/busybox-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml index 3838060..2700e66 100644 --- a/.github/workflows/consul-containers.yml +++ b/.github/workflows/consul-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml index 9ff8607..6861d22 100644 --- a/.github/workflows/debian-containers.yml +++ b/.github/workflows/debian-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml index 3b8f8ab..a39f3d7 100644 --- a/.github/workflows/etcd-v2-containers.yml +++ b/.github/workflows/etcd-v2-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml index c6a1435..6c8110c 100644 --- a/.github/workflows/etcd-v3-containers.yml +++ b/.github/workflows/etcd-v3-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml index 0ccd0fb..5cf9e7e 100644 --- a/.github/workflows/fedora-containers.yml +++ b/.github/workflows/fedora-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml index f1cf1d3..ee88c34 100644 --- a/.github/workflows/mariadb-containers.yml +++ b/.github/workflows/mariadb-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml index 2180c95..e8fbf94 100644 --- a/.github/workflows/mysql-server-containers.yml +++ b/.github/workflows/mysql-server-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml index b933763..07ddbbe 100644 --- a/.github/workflows/openldap-minion-containers.yml +++ b/.github/workflows/openldap-minion-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml index 6bd5533..c2442e7 100644 --- a/.github/workflows/opensuse-containers.yml +++ b/.github/workflows/opensuse-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml index 752e7ed..4ec42fe 100644 --- a/.github/workflows/packaging-containers.yml +++ b/.github/workflows/packaging-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml index d0081ee..c2d5d8c 100644 --- a/.github/workflows/percona-containers.yml +++ b/.github/workflows/percona-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml index 0c51623..252991a 100644 --- a/.github/workflows/photon-containers.yml +++ b/.github/workflows/photon-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml index 4975e0d..08fec80 100644 --- a/.github/workflows/python-containers.yml +++ b/.github/workflows/python-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml index a35a0c4..b1a4685 100644 --- a/.github/workflows/rabbitmq-containers.yml +++ b/.github/workflows/rabbitmq-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml index 348cc29..9d3c78f 100644 --- a/.github/workflows/redis-containers.yml +++ b/.github/workflows/redis-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/rockylinux-containers.yml b/.github/workflows/rockylinux-containers.yml index 6bc01be..a63f976 100644 --- a/.github/workflows/rockylinux-containers.yml +++ b/.github/workflows/rockylinux-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml index cf294d7..b8f0019 100644 --- a/.github/workflows/salt-containers.yml +++ b/.github/workflows/salt-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml index 1d281b7..b3ee7c3 100644 --- a/.github/workflows/salt-gitfs-http-containers.yml +++ b/.github/workflows/salt-gitfs-http-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml index 5b2530e..8b90728 100644 --- a/.github/workflows/ssh-minion-containers.yml +++ b/.github/workflows/ssh-minion-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/testing-containers.yml b/.github/workflows/testing-containers.yml index ab3712f..2f40e5c 100644 --- a/.github/workflows/testing-containers.yml +++ b/.github/workflows/testing-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml index b5bca61..efcc77c 100644 --- a/.github/workflows/tinyproxy-containers.yml +++ b/.github/workflows/tinyproxy-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml index 5a9c8d1..665a66b 100644 --- a/.github/workflows/ubuntu-containers.yml +++ b/.github/workflows/ubuntu-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml index 0ca65cf..135b901 100644 --- a/.github/workflows/vault-containers.yml +++ b/.github/workflows/vault-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml index eb45ab9..cd191be 100644 --- a/.github/workflows/virt-minion-containers.yml +++ b/.github/workflows/virt-minion-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }} diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml index 0373e97..41cd41b 100644 --- a/.github/workflows/zookeeper-containers.yml +++ b/.github/workflows/zookeeper-containers.yml @@ -30,7 +30,7 @@ concurrency: jobs: matrix-generator: name: Generate Matrix - runs-on: ubuntu-latest + runs-on: linux-x86_64 outputs: tags: ${{ steps.set-matrix.outputs.tags }} name: ${{ steps.set-matrix.outputs.name }}