From f36c2c06a324d8100207cd3c6d81c2e9b2a3d391 Mon Sep 17 00:00:00 2001 From: twangboy Date: Mon, 4 Nov 2024 14:19:03 -0700 Subject: [PATCH] Trim what we're testing on --- .github/workflows/ci.yml | 318 ------------------------ .github/workflows/templates/generate.py | 219 +--------------- .github/workflows/test-windows.yml | 7 +- kitchen.macos.yml | 42 ---- kitchen.yml | 138 ---------- 5 files changed, 8 insertions(+), 716 deletions(-) delete mode 100644 kitchen.macos.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91019ec..39f042d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,37 +114,6 @@ jobs: - macos-12: - name: macOS 12 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-macos.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: macos-12 - display-name: macOS 12 - timeout: 20 - runs-on: macos-12 - instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' - - - macos-13: - name: macOS 13 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-macos.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: macos-13 - display-name: macOS 13 - timeout: 20 - runs-on: macos-13 - instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]' - - - windows-2022: name: Windows 2022 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -161,244 +130,6 @@ jobs: - almalinux-8: - name: AlmaLinux 8 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: almalinux-8 - display-name: AlmaLinux 8 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' - - - almalinux-9: - name: AlmaLinux 9 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: almalinux-9 - display-name: AlmaLinux 9 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - amazon-2: - name: Amazon 2 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: amazon-2 - display-name: Amazon 2 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' - - - arch: - name: Arch - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: arch - display-name: Arch - timeout: 20 - instances: '["git-master", "latest", "default"]' - - - centos-stream9: - name: CentOS Stream 9 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: centos-stream9 - display-name: CentOS Stream 9 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - debian-11: - name: Debian 11 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: debian-11 - display-name: Debian 11 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - debian-12: - name: Debian 12 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: debian-12 - display-name: Debian 12 - timeout: 20 - instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - fedora-39: - name: Fedora 39 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: fedora-39 - display-name: Fedora 39 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]' - - - fedora-40: - name: Fedora 40 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: fedora-40 - display-name: Fedora 40 - timeout: 20 - instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - gentoo: - name: Gentoo - if: github.event_name == 'push' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: gentoo - display-name: Gentoo - timeout: 90 - instances: '["git-master"]' - - - gentoo-systemd: - name: Gentoo (systemd) - if: github.event_name == 'push' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: gentoo-systemd - display-name: Gentoo (systemd) - timeout: 90 - instances: '["git-master"]' - - - opensuse-15: - name: Opensuse 15 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: opensuse-15 - display-name: Opensuse 15 - timeout: 20 - instances: '["latest", "default"]' - - - oraclelinux-8: - name: Oracle Linux 8 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: oraclelinux-8 - display-name: Oracle Linux 8 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' - - - oraclelinux-9: - name: Oracle Linux 9 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: oraclelinux-9 - display-name: Oracle Linux 9 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - photon-4: - name: Photon OS 4 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: photon-4 - display-name: Photon OS 4 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]' - - - photon-5: - name: Photon OS 5 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: photon-5 - display-name: Photon OS 5 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]' - - - rockylinux-8: - name: Rocky Linux 8 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: rockylinux-8 - display-name: Rocky Linux 8 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' - - rockylinux-9: name: Rocky Linux 9 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -413,34 +144,6 @@ jobs: instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - ubuntu-2004: - name: Ubuntu 20.04 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: ubuntu-2004 - display-name: Ubuntu 20.04 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - - ubuntu-2204: - name: Ubuntu 22.04 - if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' - uses: ./.github/workflows/test-linux.yml - needs: - - lint - - generate-actions-workflow - with: - distro-slug: ubuntu-2204 - display-name: Ubuntu 22.04 - timeout: 20 - instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - - ubuntu-2404: name: Ubuntu 24.04 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -463,29 +166,8 @@ jobs: needs: - lint - generate-actions-workflow - - macos-12 - - macos-13 - windows-2022 - - almalinux-8 - - almalinux-9 - - amazon-2 - - arch - - centos-stream9 - - debian-11 - - debian-12 - - fedora-39 - - fedora-40 - - gentoo - - gentoo-systemd - - opensuse-15 - - oraclelinux-8 - - oraclelinux-9 - - photon-4 - - photon-5 - - rockylinux-8 - rockylinux-9 - - ubuntu-2004 - - ubuntu-2204 - ubuntu-2404 if: always() steps: diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index f285da8..3d842dd 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -6,171 +6,46 @@ import pathlib os.chdir(os.path.abspath(os.path.dirname(__file__))) -## "amazon-2023", -## "opensuse-tumbleweed", LINUX_DISTROS = [ - "almalinux-8", - "almalinux-9", - "amazon-2", - "arch", - "centos-stream9", - "debian-11", - "debian-12", - "fedora-39", - "fedora-40", - "gentoo", - "gentoo-systemd", - "opensuse-15", - "oraclelinux-8", - "oraclelinux-9", - "photon-4", - "photon-5", - "rockylinux-8", "rockylinux-9", - "ubuntu-2004", - "ubuntu-2204", "ubuntu-2404", ] WINDOWS = [ "windows-2022", ] -OSX = [ - "macos-12", - "macos-13", -] - - -## "amazon-2023", -## "opensuse-tumbleweed", STABLE_DISTROS = [ - "almalinux-8", - "almalinux-9", - "amazon-2", - "arch", - "centos-stream9", - "debian-11", - "debian-12", - "fedora-39", - "fedora-40", - "opensuse-15", - "oraclelinux-8", - "oraclelinux-9", - "photon-4", - "photon-5", - "rockylinux-8", "rockylinux-9", - "ubuntu-2004", - "ubuntu-2204", "ubuntu-2404", ] -## "amazon-2023", ONEDIR_DISTROS = [ - "almalinux-8", - "almalinux-9", - "amazon-2", - "centos-stream9", - "debian-11", - "debian-12", - "fedora-39", - "fedora-40", - "oraclelinux-8", - "oraclelinux-9", - "photon-4", - "photon-5", - "rockylinux-8", "rockylinux-9", - "ubuntu-2004", - "ubuntu-2204", "ubuntu-2404", ] ONEDIR_RC_DISTROS = [ - "almalinux-9", - "amazon-2", - "centos-stream9", - "debian-12", - "oraclelinux-9", - "photon-4", - "photon-5", "rockylinux-9", "ubuntu-2404", ] -## "opensuse-tumbleweed", BLACKLIST_3006 = [ - "arch", - "debian-12", - "fedora-40", - "gentoo", - "gentoo-systemd", - "opensuse-15", "ubuntu-2404", ] -## "opensuse-tumbleweed", -BLACKLIST_3007 = [ - "arch", - "fedora-39", - "gentoo", - "gentoo-systemd", - "opensuse-15", - "photon-4", - "photon-5", -] +BLACKLIST_3007 = [] -## "amazon-2023", -## "opensuse-tumbleweed", BLACKLIST_GIT_3006 = [ - "almalinux-9", - "amazon-2", - "arch", - "centos-stream9", - "debian-11", - "debian-12", - "fedora-40", - "gentoo", - "gentoo-systemd", - "opensuse-15", - "oraclelinux-9", - "photon-4", - "photon-5", "rockylinux-9", - "ubuntu-2004", - "ubuntu-2204", "ubuntu-2404", ] -## "amazon-2023", -## "opensuse-tumbleweed", BLACKLIST_GIT_3007 = [ - "almalinux-9", - "amazon-2", - "arch", - "centos-stream9", - "debian-11", - "debian-12", - "fedora-39", - "fedora-40", - "gentoo", - "gentoo-systemd", - "opensuse-15", - "oraclelinux-9", - "photon-4", - "photon-5", "rockylinux-9", - "ubuntu-2004", - "ubuntu-2204", "ubuntu-2404", ] -BLACKLIST_GIT_MASTER = [ - "amazon-2", - "fedora-39", - "photon-4", - "photon-5", -] +BLACKLIST_GIT_MASTER = [] SALT_VERSIONS = [ "3006", @@ -225,57 +100,19 @@ GIT_VERSION_BLACKLIST = [ # SetuptoolsDeprecationWarning: setup.py install is deprecated. # Use build and pip and other standards-based tools. # -GIT_DISTRO_BLACKLIST = [ - "almalinux-8", - "fedora-39", - "opensuse-15", - "oraclelinux-8", - "rockylinux-8", -] +GIT_DISTRO_BLACKLIST = [] -LATEST_PKG_BLACKLIST = [ - "gentoo", - "gentoo-systemd", -] +LATEST_PKG_BLACKLIST = [] -## "amazon-2023": "Amazon 2023", -## "opensuse-tumbleweed": "Opensuse Tumbleweed", DISTRO_DISPLAY_NAMES = { - "almalinux-8": "AlmaLinux 8", - "almalinux-9": "AlmaLinux 9", - "amazon-2": "Amazon 2", - "arch": "Arch", - "centos-stream9": "CentOS Stream 9", - "debian-11": "Debian 11", - "debian-12": "Debian 12", - "fedora-39": "Fedora 39", - "fedora-40": "Fedora 40", - "gentoo": "Gentoo", - "gentoo-systemd": "Gentoo (systemd)", - "opensuse-15": "Opensuse 15", - "oraclelinux-8": "Oracle Linux 8", - "oraclelinux-9": "Oracle Linux 9", - "photon-4": "Photon OS 4", - "photon-5": "Photon OS 5", - "rockylinux-8": "Rocky Linux 8", "rockylinux-9": "Rocky Linux 9", - "ubuntu-2004": "Ubuntu 20.04", - "ubuntu-2204": "Ubuntu 22.04", "ubuntu-2404": "Ubuntu 24.04", - "macos-12": "macOS 12", - "macos-13": "macOS 13", "windows-2022": "Windows 2022", } TIMEOUT_DEFAULT = 20 -TIMEOUT_OVERRIDES = { - "gentoo": 90, - "gentoo-systemd": 90, -} -VERSION_ONLY_OVERRIDES = [ - "gentoo", - "gentoo-systemd", -] +TIMEOUT_OVERRIDES = {} +VERSION_ONLY_OVERRIDES = [] TEMPLATE = """ {distro}: @@ -296,50 +133,6 @@ def generate_test_jobs(): test_jobs = "" needs = ["lint", "generate-actions-workflow"] - test_jobs += "\n" - for distro in OSX: - test_jobs += "\n" - runs_on = distro - runs_on = f"\n runs-on: {runs_on}" - ifcheck = "\n if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'" - uses = "./.github/workflows/test-macos.yml" - instances = [] - timeout_minutes = ( - TIMEOUT_OVERRIDES[distro] - if distro in TIMEOUT_OVERRIDES - else TIMEOUT_DEFAULT - ) - - for salt_version in SALT_VERSIONS: - if salt_version == "latest": - instances.append(salt_version) - continue - - for bootstrap_type in ["stable"]: - if bootstrap_type == "stable": - if salt_version in MAC_STABLE_VERSION_BLACKLIST: - continue - - test_target = f"{bootstrap_type}-{salt_version}" - instances.append(test_target) - - for bootstrap_type in ["default"]: - if distro not in STABLE_DISTROS: - continue - instances.append(bootstrap_type) - - if instances: - needs.append(distro) - test_jobs += TEMPLATE.format( - distro=distro, - runs_on=runs_on, - uses=uses, - ifcheck=ifcheck, - instances=json.dumps(instances), - display_name=DISTRO_DISPLAY_NAMES[distro], - timeout_minutes=timeout_minutes, - ) - test_jobs += "\n" for distro in WINDOWS: test_jobs += "\n" diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index fc906dd..ecc332c 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -63,12 +63,9 @@ jobs: Write-Output "Environment Variables" Get-ChildItem Env: - - name: Refresh Environment + - name: Add Salt to Path run: | - foreach ($level in "Machine", "User") { - $vars = [Environment]::GetEnvironmentVariables($level).GetEnumerator() - $vars | ForEach-Object { $_ } | Set-Content -Path { "Env:$( $_.Name )" } - } + $env:Path = "$env:Path;C:\Program Files\Salt Project\Salt" - name: Test Bootstrap run: | diff --git a/kitchen.macos.yml b/kitchen.macos.yml deleted file mode 100644 index 616a489..0000000 --- a/kitchen.macos.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -driver: - name: exec - -provisioner: - sudo: true - salt_bootstrap_options: -MP stable %s - init_environment: | - echo 'auto_accept: true' > /tmp/auto-accept-keys.conf - sudo mkdir -p /etc/salt/master.d - sudo mv /tmp/auto-accept-keys.conf /etc/salt/master.d/auto-accept-keys.conf - brew install coreutils - sh -c 't=$(gshuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' - -platforms: - - name: macos-12 - - name: macos-13 - -suites: - - name: stable-3006 - provisioner: - salt_version: 3006 - salt_call_command: /opt/salt/salt-call - - name: stable-3006-8 - provisioner: - salt_version: 3006.8 - salt_call_command: /opt/salt/salt-call - - name: stable-3007 - provisioner: - salt_version: 3007 - salt_call_command: /opt/salt/salt-call - - name: stable-3007-1 - provisioner: - salt_version: 3007.1 - salt_call_command: /opt/salt/salt-call - - name: latest - provisioner: - salt_version: latest - salt_call_command: /opt/salt/salt-call - -verifier: - command: pytest --cache-clear -v -s -ra --log-cli-level=debug -k "not test_ping" tests/integration/ diff --git a/kitchen.yml b/kitchen.yml index 62cc738..a089275 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -29,136 +29,13 @@ provisioner: sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t' -## - name: amazon-2023 -## driver: -## image: amazonlinux:2023 -## provision_command: -## - yum -y install --allowerasing procps-ng curl -## - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - -## - name: opensuse-tumbleweed -## driver: -## image: opensuse/tumbleweed:latest -## provision_command: -## - *opensuse_provision_command_01 -## - *opensuse_provision_command_02 -## - *opensuse_provision_command_03 -## - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - platforms: - - name: almalinux-9 - driver: - provision_command: - - dnf -y install crypto-policies-scripts procps-ng - - update-crypto-policies --set DEFAULT:SHA1 - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: almalinux-8 - - name: amazon-2 - driver: - image: amazonlinux:2 - platform: rhel - provision_command: - - yum -y install procps-ng - - name: arch - driver: - image: archlinux/archlinux - provision_command: - - pacman -Syu --noconfirm --needed systemd grep awk procps which - - systemctl enable sshd - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: centos-stream9 - driver: - platform: centosstream - image: quay.io/centos/centos:stream9 - provision_command: - - dnf -y install crypto-policies-scripts procps-ng - - update-crypto-policies --set DEFAULT:SHA1 - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: debian-11 - driver: - image: debian:bullseye - run_command: /lib/systemd/systemd - - name: debian-12 - driver: - image: debian:bookworm - run_command: /lib/systemd/systemd - provision_command: - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: fedora-39 - driver: - provision_command: &fedora_provision_command - - dnf -y install procps-ng crypto-policies-scripts - - update-crypto-policies --set LEGACY - - name: fedora-40 - driver: - provision_command: *fedora_provision_command - - name: gentoo - driver: - image: gentoo/stage3:latest - run_command: /sbin/init - provision_command: - - rc-update add sshd default - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: gentoo-systemd - driver: - image: gentoo/stage3:systemd - run_command: /lib/systemd/systemd - provision_command: - - systemctl enable sshd.service - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: opensuse-15 - driver: - image: opensuse/leap:15.4 - provision_command: - - &opensuse_provision_command_01 zypper --non-interactive install --auto-agree-with-licenses dbus-1 - - &opensuse_provision_command_02 zypper --non-interactive install --auto-agree-with-licenses sudo openssh which curl systemd - - &opensuse_provision_command_03 systemctl enable sshd.service - name: rockylinux-9 - driver: - platform: centosstream - run_command: /usr/lib/systemd/systemd - provision_command: - - dnf -y install crypto-policies-scripts procps-ng - - update-crypto-policies --set DEFAULT:SHA1 - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: oraclelinux-9 - driver: - run_command: /usr/lib/systemd/systemd - provision_command: - - dnf -y install crypto-policies-scripts procps-ng - - update-crypto-policies --set DEFAULT:SHA1 - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: rockylinux-8 - - name: oraclelinux-8 - name: ubuntu-24.04 driver: run_command: /lib/systemd/systemd provision_command: - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: ubuntu-22.04 - driver: - run_command: /lib/systemd/systemd - provision_command: - - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config - - name: ubuntu-20.04 - driver: - run_command: /lib/systemd/systemd - - name: photon-4 - driver: - image: photon:4.0 - provision_command: - - tdnf -y install rpm procps-ng coreutils gawk systemd - - echo "PubkeyAcceptedKeyTypes +ssh-rsa" | tee -a /etc/ssh/sshd_config - - sed -ie 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config - - systemctl enable sshd.service - - name: photon-5 - driver: - image: photon:5.0 - provision_command: - - tdnf -y install rpm procps-ng coreutils gawk systemd - - echo "PubkeyAcceptedKeyTypes +ssh-rsa" | tee -a /etc/ssh/sshd_config - - sed -ie 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config - - systemctl enable sshd.service suites: - name: git-3006 @@ -168,9 +45,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - debian-11 - - debian-12 - - arch - gentoo - gentoo-systemd - name: git-3006x @@ -180,9 +54,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - debian-11 - - debian-12 - - arch - gentoo - gentoo-systemd - name: git-3007 @@ -192,8 +63,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - debian-11 - - arch - gentoo - gentoo-systemd - name: git-3007x @@ -203,8 +72,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - debian-11 - - arch - gentoo - gentoo-systemd - name: stable-3006 @@ -214,7 +81,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - arch - name: stable-3006-8 provisioner: salt_version: 3006.8 @@ -222,7 +88,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - arch - name: stable-3007 provisioner: salt_version: 3007 @@ -230,7 +95,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - arch - name: stable-3007-1 provisioner: salt_version: 3007.1 @@ -238,7 +102,6 @@ suites: excludes: - opensuse-15 - opensuse-tumbleweed - - arch - name: git-master provisioner: salt_version: master @@ -279,7 +142,6 @@ suites: salt_version: 3008.0rc1 salt_bootstrap_options: -R staging.repo.saltproject.io -MP onedir_rc %s excludes: - - arch - gentoo - opensuse-15 - opensuse-tumbleweed