From 73475d2505d7648bceed428817df056677eb2325 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Thu, 12 Dec 2024 12:24:29 -0700 Subject: [PATCH] Removed Debian-13 container and cleaned up debug statements --- .github/workflows/ci.yml | 16 -------- .github/workflows/templates/generate.py | 7 ++-- .github/workflows/test-linux.yml | 49 +------------------------ tests/integration/test_installation.py | 5 --- 4 files changed, 6 insertions(+), 71 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1df1bd8de..71d622007 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,21 +225,6 @@ jobs: instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]' - debian-13: - name: Debian 13 - 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-13 - display-name: Debian 13 - container-slug: debian-13 - timeout: 20 - instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]' - - photon-5: name: Photon OS 5 if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true' @@ -315,7 +300,6 @@ jobs: - amazonlinux-2023 - debian-11 - debian-12 - - debian-13 - photon-5 - rockylinux-8 - rockylinux-9 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 78f1d8216..cb0e693ac 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -7,6 +7,7 @@ os.chdir(os.path.abspath(os.path.dirname(__file__))) # "amazonlinux-2", +# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -15,7 +16,6 @@ "amazonlinux-2023", "debian-11", "debian-12", - "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -33,6 +33,7 @@ ] # "amazonlinux-2", +# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -41,7 +42,6 @@ "amazonlinux-2023", "debian-11", "debian-12", - "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -49,6 +49,7 @@ ] # "amazonlinux-2", +# "debian-13", # "fedora-40", # "photon-4", # "ubuntu-2004", @@ -57,7 +58,6 @@ "amazonlinux-2023", "debian-11", "debian-12", - "debian-13", "photon-5", "rockylinux-8", "rockylinux-9", @@ -94,6 +94,7 @@ "amazonlinux-2023", "debian-11", "debian-12", + "debian-13", "fedora-40", "photon-4", "photon-5", diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 5ed8719fe..b9c5662ba 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -32,10 +32,6 @@ jobs: Test: name: ${{ matrix.instance }} runs-on: ubuntu-latest - ## DGM container: - ## DGM image: ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }} - ## DGM options: --privileged - timeout-minutes: ${{ inputs.timeout }} strategy: max-parallel: 2 @@ -46,37 +42,6 @@ jobs: steps: - uses: actions/checkout@v4 - ## DGM - name: Install Python Dependencies with pip breakage - ## DGM if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }} - ## DGM run: | - ## DGM python3 -m pip install --break-system-packages -r tests/requirements.txt - - ## DGM - name: Install Python Dependencies without pip breakage - ## DGM if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }} - ## DGM run: | - ## DGM python3 -m pip install -r tests/requirements.txt - - ## DGM - name: Get Version - ## DGM run: | - ## DGM # We need to get the version here and make it an environment variable - ## DGM # It is used to install via bootstrap and in the test - ## DGM # The version is in the instance name - ## DGM # sed 1st - becomes space, 2nd - becomes dot - ## DGM vt_parm_ver=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}') - ## DGM echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV - - ## DGM - name: Bootstrap Salt - ## DGM run: | - ## DGM # sed 1st - becomes space, 2nd - becomes dot - ## DGM bt_arg1=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $1}') - ## DGM bt_arg2=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}') - ## DGM echo "bt parms ,$bt_parms, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2," - ## DGM sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2" - - ## DGM - name: Test Bootstrap - ## DGM run: | - ## DGM pytest --cache-clear -v -s -ra --log-cli-level=debug tests/integration/ - - name: Get Version run: | # We need to get the version here and make it an environment variable @@ -98,23 +63,13 @@ jobs: run: | /usr/bin/docker start ${{ github.run_id }}_salt-test - - name: Current Directory - run: | - pwd - ls -alh - - ## DGM - name: Download requirements file tests/requirements.txt - ## DGM uses: actions/download-artifact@v4 - ## DGM with: - ## DGM - name: requirements.txt - - name: "Install Python Dependencies with pip breakage in container ${{ inputs.container-slug }}" - if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }} + if: ${{ ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }} run: | docker exec ${{ github.run_id}}_salt-test python3 -m pip install --break-system-packages -r /_w/btstrap/tests/requirements.txt - name: "Install Python Dependencies without pip breakage in container ${{ inputs.container-slug }}" - if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }} + if: ${{ ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }} run: | docker exec ${{ github.run_id}}_salt-test python3 -m pip install -r /_w/btstrap/tests/requirements.txt diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py index 94a9d416e..2bc739489 100644 --- a/tests/integration/test_installation.py +++ b/tests/integration/test_installation.py @@ -35,7 +35,6 @@ def run_salt_call(cmd): log.error(f"failed to produce output result, '{result}'") else: - print(f"DGM run_salt_call platform.system '{platform.system()}'", flush=True) if platform.system() == "Darwin": cmdl = ["sudo"] else: @@ -51,7 +50,6 @@ def run_salt_call(cmd): stderr=subprocess.PIPE, universal_newlines=True, ) - print(f"DGM run_salt_call result '{result}'", flush=True) if 0 == result.returncode: json_data = json.loads(result.stdout) else: @@ -63,7 +61,6 @@ def run_salt_call(cmd): def test_ping(path): cmd = ["salt-call", "--local", "test.ping"] result = run_salt_call(cmd) - print(f"DGM test_ping result '{result}'", flush=True) assert result == True @@ -71,7 +68,6 @@ def test_target_python_version(path, target_python_version): cmd = ["salt-call", "--local", "grains.item", "pythonversion", "--timeout=120"] result = run_salt_call(cmd) # Returns: {'pythonversion': [3, 10, 11, 'final', 0]} - print(f"DGM test_target_python_version result '{result}'", flush=True) py_maj_ver = result["pythonversion"][0] assert py_maj_ver == target_python_version @@ -82,6 +78,5 @@ def test_target_salt_version(path, target_salt_version): cmd = ["salt-call", "--local", "grains.item", "saltversion", "--timeout=120"] result = run_salt_call(cmd) # Returns: {'saltversion': '3006.9+217.g53cfa53040'} - print(f"DGM test_target_salt_version result '{result}'", flush=True) adj_saltversion = result["saltversion"].split("+")[0] assert adj_saltversion == target_salt_version