Skip to content

Commit

Permalink
Remove environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Feb 18, 2025
1 parent 073fd3c commit 517a790
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/test-packages-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,8 @@ jobs:
docker pull ${{ matrix.container }}
- name: "Create container ${{ matrix.container }}"
#run: |
# tools container create ${{ matrix.container }} --name ${{ github.run_id }}_salt-test-pkg
run: |
/usr/bin/docker create --name ${{ github.run_id }}_salt-test-pkg --workdir /__w/salt/salt --privileged -e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/home/runner/work":"/__w" -v "/home/runner/work/_temp":"/__w/_temp" -v "/home/runner/work/_actions":"/__w/_actions" -v "/opt/hostedtoolcache":"/__t" -v "/home/runner/work/_temp/_github_home":"/github/home" -v "/home/runner/work/_temp/_github_workflow":"/github/workflow" --entrypoint "/usr/lib/systemd/systemd" ${{ matrix.container }} --systemd --unit rescue.target
tools container create ${{ matrix.container }} --name ${{ github.run_id }}_salt-test-pkg
- name: "Start container ${{ matrix.container }}"
run: |
Expand All @@ -167,11 +164,6 @@ jobs:
- name: Run Package Tests
run: |
docker exec \
-e SKIP_REQUIREMENTS_INSTALL=1 \
-e RERUN_FAILURES=1 \
-e GITHUB_ACTIONS_PIPELINE=1 \
-e SKIP_INITIAL_GH_ACTIONS_FAILURES=1 \
-e COVERAGE_CONTEXT=${{ matrix.slug }} \
${{ github.run_id }}_salt-test-pkg \
python3 -m nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.tests-chunk }} \
${{ matrix.version && format('--prev-version={0}', matrix.version) || ''}}
Expand Down
2 changes: 0 additions & 2 deletions tools/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ def create(ctx: Context, image: str, name: str = ""):
"create",
f"--name={name}",
"--privileged",
# "--ulimit",
# "\"nofile=262144:262144\"",
f"--workdir={workdir}",
"-v",
"/tmp/:/var/lib/docker",
Expand Down

0 comments on commit 517a790

Please sign in to comment.