Skip to content

Commit 3170f9d

Browse files
updated docker file
1 parent c26d2b3 commit 3170f9d

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

.github/scripts/ppc64le-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ if ! pytest "$PACKAGE_NAME/test/test_utils.py"; then
3333
echo "------------------$PACKAGE_NAME:install_success_but_test_fails---------------------"
3434
exit 2
3535
else
36-
echo "------------------$PACKAGE_NAME:install_&_test_both_success-------------------------"
36+
echo "------------------$PACKAGE_NAME:install_and_test_both_success-------------------------"
3737
exit 0
3838
fi

.github/scripts/ppc64le/self-hosted-builder/[email protected]

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[Unit]
22
Description=Self-Hosted IBM power Github Actions Runner
3-
#After=network.target docker.service
4-
#Requires=docker.service
53
StartLimitIntervalSec=0
64

75
[Service]
@@ -15,9 +13,6 @@ ExecStartPre=-/usr/bin/docker rm --force actions-runner.%i
1513
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
1614
ExecStartPre=-/usr/local/bin/gh_cat_token.sh /etc/actions-runner/%i/ghtoken.env /etc/actions-runner/%i/ghtoken.txt
1715

18-
# Wait for token to be written to the pipe
19-
#ExecStartPre=/bin/bash -c 'while [ ! -s /etc/actions-runner/%i/ghtoken.txt ]; do sleep 1; done'
20-
2116
ExecStart=/usr/bin/docker run \
2217
--env-file=/etc/actions-runner/%i/env \
2318
--volume /etc/actions-runner/%i/ghtoken.txt:/run/runner_secret \

.github/scripts/ppc64le/self-hosted-builder/fs/usr/bin/actions-runner

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ if [ ! -f /run/runner_secret ]; then
4141
fi
4242

4343

44-
4544
ACCESS_TOKEN="$(cat /run/runner_secret)"
4645

4746
# Generate registration token
@@ -58,7 +57,6 @@ unset ACCESS_TOKEN
5857
# it does one job, stops and unregisters
5958
registration_token=$(jq --raw-output .token "$token_file")
6059

61-
6260
./config.sh \
6361
--unattended \
6462
--ephemeral \
@@ -69,12 +67,7 @@ registration_token=$(jq --raw-output .token "$token_file")
6967
--labels self-hosted,linux.ppc64le
7068

7169
unset registration_token
72-
#rm -f "$token_file"
73-
74-
# enter into python virtual environment.
75-
# build workflows use "python -m pip install ...",
76-
# and it doesn't work for non-root user
77-
#source venv/bin/activate
70+
rm -f "$token_file"
7871

7972
# Run one job.
8073
./run.sh

.github/workflows/Dockerfile.ppc64le

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ FROM registry.access.redhat.com/ubi9/ubi:9.3
44
# Install necessary dependencies
55
RUN dnf install -y \
66
https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
7-
dnf install -y git cmake ninja-build gcc-c++ rust cargo \
7+
dnf install -y git cmake ninja-build gcc-toolset-13 rust cargo \
88
python3 python3-devel && \
99
dnf clean all
1010

11+
RUN source /opt/rh/gcc-toolset-13/enable
1112
# Set Python and pip aliases to use Python 3.9
1213
RUN ln -sf /usr/bin/python3 /usr/bin/python && \
1314
ln -sf /usr/bin/pip3 /usr/bin/pip

0 commit comments

Comments
 (0)