s390x ci: ensure CI starts correctly if token pipe is not removed (#145840)

Mark stop actions as "may fail".
Container is expected to stop on it's own in normal case.

Remove "may fail" mark from token generation steps.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/145840
Approved by: https://github.com/huydhn
This commit is contained in:
Aleksei Nikiforov 2025-01-31 17:46:07 +00:00 committed by PyTorch MergeBot
parent 44ecbcbd5a
commit d0748566b4
2 changed files with 7 additions and 6 deletions

View file

@ -8,8 +8,8 @@ StartLimitIntervalSec=0
Type=simple
Restart=always
ExecStartPre=-/usr/bin/docker rm --force actions-runner.%i
ExecStartPre=-/usr/local/bin/gh_token_generator.sh /etc/actions-runner/%i/appid.env /etc/actions-runner/%i/installid.env /etc/actions-runner/%i/key_private.pem /etc/actions-runner/%i/ghtoken.env
ExecStartPre=-/usr/local/bin/gh_cat_token.sh /etc/actions-runner/%i/ghtoken.env /etc/actions-runner/%i/ghtoken.socket
ExecStartPre=/usr/local/bin/gh_token_generator.sh /etc/actions-runner/%i/appid.env /etc/actions-runner/%i/installid.env /etc/actions-runner/%i/key_private.pem /etc/actions-runner/%i/ghtoken.env
ExecStartPre=/usr/local/bin/gh_cat_token.sh /etc/actions-runner/%i/ghtoken.env /etc/actions-runner/%i/ghtoken.socket
ExecStart=/usr/bin/docker run \
--env-file=/etc/actions-runner/%i/env \
--volume /etc/actions-runner/%i/ghtoken.socket:/run/runner_secret \
@ -19,10 +19,10 @@ ExecStart=/usr/bin/docker run \
--rm \
--privileged \
iiilinuxibmcom/actions-runner.%i
ExecStop=/bin/sh -c "docker exec actions-runner.%i kill -INT -- -1"
ExecStop=/bin/sh -c "docker wait actions-runner.%i"
ExecStop=/bin/sh -c "docker rm actions-runner.%i"
ExecStop=/usr/bin/env rm -f /etc/actions-runner/%i/ghtoken.env /etc/actions-runner/%i/ghtoken.socket
ExecStop=-/bin/sh -c "docker exec actions-runner.%i kill -INT -- -1"
ExecStop=-/bin/sh -c "docker wait actions-runner.%i"
ExecStop=-/bin/sh -c "docker rm actions-runner.%i"
ExecStop=-/usr/bin/env rm -f /etc/actions-runner/%i/ghtoken.env /etc/actions-runner/%i/ghtoken.socket
[Install]
WantedBy=multi-user.target

View file

@ -3,5 +3,6 @@
TOKEN_FILE=$1
TOKEN_PIPE=$2
rm "${TOKEN_PIPE}" 2>/dev/null ||:
mkfifo "${TOKEN_PIPE}"
cat "${TOKEN_FILE}" > "${TOKEN_PIPE}" &