Skip to content

Commit 73475d2

Browse files
dmurphy18dmurphy18
committed
Removed Debian-13 container and cleaned up debug statements
1 parent 1040775 commit 73475d2

File tree

4 files changed

+6
-71
lines changed

4 files changed

+6
-71
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -225,21 +225,6 @@ jobs:
225225
instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
226226

227227

228-
debian-13:
229-
name: Debian 13
230-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
231-
uses: ./.github/workflows/test-linux.yml
232-
needs:
233-
- lint
234-
- generate-actions-workflow
235-
with:
236-
distro-slug: debian-13
237-
display-name: Debian 13
238-
container-slug: debian-13
239-
timeout: 20
240-
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
241-
242-
243228
photon-5:
244229
name: Photon OS 5
245230
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -315,7 +300,6 @@ jobs:
315300
- amazonlinux-2023
316301
- debian-11
317302
- debian-12
318-
- debian-13
319303
- photon-5
320304
- rockylinux-8
321305
- rockylinux-9

‎.github/workflows/templates/generate.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
os.chdir(os.path.abspath(os.path.dirname(__file__)))
88

99
# "amazonlinux-2",
10+
# "debian-13",
1011
# "fedora-40",
1112
# "photon-4",
1213
# "ubuntu-2004",
@@ -15,7 +16,6 @@
1516
"amazonlinux-2023",
1617
"debian-11",
1718
"debian-12",
18-
"debian-13",
1919
"photon-5",
2020
"rockylinux-8",
2121
"rockylinux-9",
@@ -33,6 +33,7 @@
3333
]
3434

3535
# "amazonlinux-2",
36+
# "debian-13",
3637
# "fedora-40",
3738
# "photon-4",
3839
# "ubuntu-2004",
@@ -41,14 +42,14 @@
4142
"amazonlinux-2023",
4243
"debian-11",
4344
"debian-12",
44-
"debian-13",
4545
"photon-5",
4646
"rockylinux-8",
4747
"rockylinux-9",
4848
"ubuntu-2204",
4949
]
5050

5151
# "amazonlinux-2",
52+
# "debian-13",
5253
# "fedora-40",
5354
# "photon-4",
5455
# "ubuntu-2004",
@@ -57,7 +58,6 @@
5758
"amazonlinux-2023",
5859
"debian-11",
5960
"debian-12",
60-
"debian-13",
6161
"photon-5",
6262
"rockylinux-8",
6363
"rockylinux-9",
@@ -94,6 +94,7 @@
9494
"amazonlinux-2023",
9595
"debian-11",
9696
"debian-12",
97+
"debian-13",
9798
"fedora-40",
9899
"photon-4",
99100
"photon-5",

‎.github/workflows/test-linux.yml‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ jobs:
3232
Test:
3333
name: ${{ matrix.instance }}
3434
runs-on: ubuntu-latest
35-
## DGM container:
36-
## DGM image: ghcr.io/saltstack/salt-ci-containers/testing:${{ inputs.container-slug }}
37-
## DGM options: --privileged
38-
3935
timeout-minutes: ${{ inputs.timeout }}
4036
strategy:
4137
max-parallel: 2
@@ -46,37 +42,6 @@ jobs:
4642
steps:
4743
- uses: actions/checkout@v4
4844

49-
## DGM - name: Install Python Dependencies with pip breakage
50-
## DGM if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
51-
## DGM run: |
52-
## DGM python3 -m pip install --break-system-packages -r tests/requirements.txt
53-
54-
## DGM - name: Install Python Dependencies without pip breakage
55-
## DGM if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
56-
## DGM run: |
57-
## DGM python3 -m pip install -r tests/requirements.txt
58-
59-
## DGM - name: Get Version
60-
## DGM run: |
61-
## DGM # We need to get the version here and make it an environment variable
62-
## DGM # It is used to install via bootstrap and in the test
63-
## DGM # The version is in the instance name
64-
## DGM # sed 1st - becomes space, 2nd - becomes dot
65-
## DGM vt_parm_ver=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
66-
## DGM echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
67-
68-
## DGM - name: Bootstrap Salt
69-
## DGM run: |
70-
## DGM # sed 1st - becomes space, 2nd - becomes dot
71-
## DGM bt_arg1=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $1}')
72-
## DGM bt_arg2=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./' | awk -F ' ' '{print $2}')
73-
## DGM echo "bt parms ,$bt_parms, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
74-
## DGM sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
75-
76-
## DGM - name: Test Bootstrap
77-
## DGM run: |
78-
## DGM pytest --cache-clear -v -s -ra --log-cli-level=debug tests/integration/
79-
8045
- name: Get Version
8146
run: |
8247
# We need to get the version here and make it an environment variable
@@ -98,23 +63,13 @@ jobs:
9863
run: |
9964
/usr/bin/docker start ${{ github.run_id }}_salt-test
10065
101-
- name: Current Directory
102-
run: |
103-
pwd
104-
ls -alh
105-
106-
## DGM - name: Download requirements file tests/requirements.txt
107-
## DGM uses: actions/download-artifact@v4
108-
## DGM with:
109-
## DGM - name: requirements.txt
110-
11166
- name: "Install Python Dependencies with pip breakage in container ${{ inputs.container-slug }}"
112-
if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
67+
if: ${{ ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
11368
run: |
11469
docker exec ${{ github.run_id}}_salt-test python3 -m pip install --break-system-packages -r /_w/btstrap/tests/requirements.txt
11570
11671
- name: "Install Python Dependencies without pip breakage in container ${{ inputs.container-slug }}"
117-
if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
72+
if: ${{ ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
11873
run: |
11974
docker exec ${{ github.run_id}}_salt-test python3 -m pip install -r /_w/btstrap/tests/requirements.txt
12075

‎tests/integration/test_installation.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def run_salt_call(cmd):
3535
log.error(f"failed to produce output result, '{result}'")
3636

3737
else:
38-
print(f"DGM run_salt_call platform.system '{platform.system()}'", flush=True)
3938
if platform.system() == "Darwin":
4039
cmdl = ["sudo"]
4140
else:
@@ -51,7 +50,6 @@ def run_salt_call(cmd):
5150
stderr=subprocess.PIPE,
5251
universal_newlines=True,
5352
)
54-
print(f"DGM run_salt_call result '{result}'", flush=True)
5553
if 0 == result.returncode:
5654
json_data = json.loads(result.stdout)
5755
else:
@@ -63,15 +61,13 @@ def run_salt_call(cmd):
6361
def test_ping(path):
6462
cmd = ["salt-call", "--local", "test.ping"]
6563
result = run_salt_call(cmd)
66-
print(f"DGM test_ping result '{result}'", flush=True)
6764
assert result == True
6865

6966

7067
def test_target_python_version(path, target_python_version):
7168
cmd = ["salt-call", "--local", "grains.item", "pythonversion", "--timeout=120"]
7269
result = run_salt_call(cmd)
7370
# Returns: {'pythonversion': [3, 10, 11, 'final', 0]}
74-
print(f"DGM test_target_python_version result '{result}'", flush=True)
7571
py_maj_ver = result["pythonversion"][0]
7672
assert py_maj_ver == target_python_version
7773

@@ -82,6 +78,5 @@ def test_target_salt_version(path, target_salt_version):
8278
cmd = ["salt-call", "--local", "grains.item", "saltversion", "--timeout=120"]
8379
result = run_salt_call(cmd)
8480
# Returns: {'saltversion': '3006.9+217.g53cfa53040'}
85-
print(f"DGM test_target_salt_version result '{result}'", flush=True)
8681
adj_saltversion = result["saltversion"].split("+")[0]
8782
assert adj_saltversion == target_salt_version

0 commit comments

Comments
 (0)