Skip to content

Fix vault test container name collision across parameterized runs #68947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwoz wants to merge 3 commits into
base: 3006.x
Choose a base branch
from
Open

Fix vault test container name collision across parameterized runs #68947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee9d715
Fix vault test container name collision across parameterized runs
dwoz Apr 16, 2026
c57ccc7
Work around photon 5 package index move
dwoz Apr 15, 2026
772da11
Fix vault container name collision in integration sdb tests
dwoz Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/test-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@ jobs:
run: |
docker exec ${{ github.run_id }}_salt-test chage -I -1 -m 0 -M 99999 -E -1 root

- name: Fix PhotonOS repository URLs
if: startsWith(matrix.slug, 'photonos-')
run: |
docker exec ${{ github.run_id }}_salt-test \
sed -i 's/packages.broadcom.com/packages-prod.broadcom.com/g' \
/etc/yum.repos.d/photon.repo /etc/yum.repos.d/photon-updates.repo /etc/yum.repos.d/photon-extras.repo

- name: "Show container inspect ${{ matrix.container }}"
run: |
/usr/bin/docker inspect ${{ github.run_id }}_salt-test
Expand Down Expand Up @@ -515,6 +522,13 @@ jobs:
run: |
docker exec ${{ github.run_id }}_salt-test chage -I -1 -m 0 -M 99999 -E -1 root

- name: Fix PhotonOS repository URLs
if: startsWith(matrix.slug, 'photonos-')
run: |
docker exec ${{ github.run_id }}_salt-test \
sed -i 's/packages.broadcom.com/packages-prod.broadcom.com/g' \
/etc/yum.repos.d/photon.repo /etc/yum.repos.d/photon-updates.repo /etc/yum.repos.d/photon-extras.repo

- name: "Show container inspect ${{ matrix.container }}"
run: |
/usr/bin/docker inspect ${{ github.run_id }}_salt-test
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/test-packages-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ jobs:
run: |
docker exec ${{ github.run_id }}_salt-test-pkg chage -I -1 -m 0 -M 99999 -E -1 root

- name: Fix PhotonOS repository URLs
if: startsWith(matrix.slug, 'photonos-')
run: |
docker exec ${{ github.run_id }}_salt-test-pkg \
sed -i 's/packages.broadcom.com/packages-prod.broadcom.com/g' \
/etc/yum.repos.d/photon.repo /etc/yum.repos.d/photon-updates.repo /etc/yum.repos.d/photon-extras.repo

- name: Decompress .nox Directory
run: |
docker exec ${{ github.run_id}}_salt-test-pkg python3 -m nox --force-color -e decompress-dependencies -- linux ${{ matrix.arch }}
Expand Down
3 changes: 2 additions & 1 deletion tests/pytests/functional/modules/test_vault.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import time

import pytest
from saltfactories.utils import random_string

import salt.utils.path
from tests.support.runtests import RUNTIME_VARS
Expand Down Expand Up @@ -53,7 +54,7 @@ def vault_container_version(request, salt_factories, vault_port, shell):
}

factory = salt_factories.get_container(
"vault",
random_string("vault-"),
f"ghcr.io/saltstack/salt-ci-containers/vault:{vault_version}",
check_ports=[vault_port],
container_run_kwargs={
Expand Down
3 changes: 2 additions & 1 deletion tests/pytests/integration/sdb/test_vault.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import pytest
from pytestshellutils.utils.processes import ProcessResult
from saltfactories.utils import random_string

import salt.utils.path
from tests.support.helpers import PatchedEnviron
Expand Down Expand Up @@ -48,7 +49,7 @@ def vault_container_version(request, salt_factories, vault_port, patched_environ
"max_lease_ttl": "720h",
}
factory = salt_factories.get_container(
"vault",
random_string("vault-"),
f"ghcr.io/saltstack/salt-ci-containers/vault:{vault_version}",
check_ports=[vault_port],
container_run_kwargs={
Expand Down
Loading