Skip to content

Commit 91dac00

Browse files
committed
ci(e2e): restore host-side registry credentials
Signed-off-by: Kris Hicks <khicks@nvidia.com>
1 parent a572b95 commit 91dac00

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ jobs:
5757
- /var/run/docker.sock:/var/run/docker.sock
5858
- /home/runner/_work:/home/runner/_work
5959
env:
60+
MISE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6061
IMAGE_TAG: ${{ inputs.image-tag }}
6162
OPENSHELL_REGISTRY: ghcr.io/nvidia/openshell
6263
OPENSHELL_REGISTRY_HOST: ghcr.io
6364
OPENSHELL_REGISTRY_NAMESPACE: nvidia/openshell
65+
OPENSHELL_REGISTRY_USERNAME: ${{ github.actor }}
66+
OPENSHELL_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
6467
steps:
6568
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6669
with:
@@ -84,17 +87,11 @@ jobs:
8487
run: apt-get update && apt-get install -y ${APT_PACKAGES} && rm -rf /var/lib/apt/lists/*
8588

8689
- name: Log in to GHCR with Docker
87-
env:
88-
GHCR_USERNAME: ${{ github.actor }}
89-
GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
90-
run: echo "${GHCR_PASSWORD}" | docker login ghcr.io -u "${GHCR_USERNAME}" --password-stdin
90+
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
9191

9292
- name: Log in to GHCR with Podman
9393
if: startsWith(matrix.suite, 'rust-podman')
94-
env:
95-
GHCR_USERNAME: ${{ github.actor }}
96-
GHCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
97-
run: echo "${GHCR_PASSWORD}" | podman login ghcr.io -u "${GHCR_USERNAME}" --password-stdin
94+
run: echo "${{ secrets.GITHUB_TOKEN }}" | podman login ghcr.io -u "${{ github.actor }}" --password-stdin
9895

9996
- name: Set up rootless Podman user
10097
if: matrix.rootless
@@ -122,7 +119,6 @@ jobs:
122119
env:
123120
OPENSHELL_SUPERVISOR_IMAGE: ${{ format('ghcr.io/nvidia/openshell/supervisor:{0}', inputs.image-tag) }}
124121
OPENSHELL_MCP_CONFORMANCE_CLIENT_IMAGE: ${{ format('openshell-mcp-conformance-client:{0}', inputs.image-tag) }}
125-
MISE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
126122
E2E_CMD: ${{ matrix.cmd }}
127123
run: |
128124
if [ "${{ matrix.rootless }}" = "true" ]; then
@@ -139,6 +135,8 @@ jobs:
139135
OPENSHELL_SUPERVISOR_IMAGE="${OPENSHELL_SUPERVISOR_IMAGE}" \
140136
OPENSHELL_REGISTRY="${OPENSHELL_REGISTRY}" \
141137
OPENSHELL_REGISTRY_HOST="${OPENSHELL_REGISTRY_HOST}" \
138+
OPENSHELL_REGISTRY_USERNAME="${OPENSHELL_REGISTRY_USERNAME}" \
139+
OPENSHELL_REGISTRY_PASSWORD="${OPENSHELL_REGISTRY_PASSWORD}" \
142140
IMAGE_TAG="${IMAGE_TAG}" \
143141
MISE_GITHUB_TOKEN="${MISE_GITHUB_TOKEN}" \
144142
bash -c "${E2E_CMD}"

0 commit comments

Comments
 (0)