From 93e89b34740c509406e948c78a404dd2fba67b8b Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Fri, 3 Dec 2021 12:09:31 +0100
Subject: [PATCH] ci: upgrade s390x runner to v2.285.0

This is needed for composite actions with conditional steps.

Fixes #416.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
 travis-ci/vmtest/s390x-self-hosted-builder/README.md          | 4 ++--
 .../actions-runner-libbpf.Dockerfile                          | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/travis-ci/vmtest/s390x-self-hosted-builder/README.md b/travis-ci/vmtest/s390x-self-hosted-builder/README.md
index 5f173bc..3e9f966 100644
--- a/travis-ci/vmtest/s390x-self-hosted-builder/README.md
+++ b/travis-ci/vmtest/s390x-self-hosted-builder/README.md
@@ -62,8 +62,8 @@ $ sudo systemctl restart actions-runner-libbpf
 The `actions-runner-libbpf` service stores various temporary data, such as
 runner  registration information, work directories and logs, in the
 `actions-runner-libbpf` volume. In order to remove it and start from scratch,
-e.g. when switching the runner to a different repository, use the following
-commands:
+e.g. when upgrading the runner or switching it to a different repository, use
+the following commands:
 
 ```
 $ sudo systemctl stop actions-runner-libbpf
diff --git a/travis-ci/vmtest/s390x-self-hosted-builder/actions-runner-libbpf.Dockerfile b/travis-ci/vmtest/s390x-self-hosted-builder/actions-runner-libbpf.Dockerfile
index 1145ec5..a07f177 100644
--- a/travis-ci/vmtest/s390x-self-hosted-builder/actions-runner-libbpf.Dockerfile
+++ b/travis-ci/vmtest/s390x-self-hosted-builder/actions-runner-libbpf.Dockerfile
@@ -33,13 +33,14 @@ RUN ln -fs /etc/resolv.conf /usr/x86_64-linux-gnu/etc/
 ENV QEMU_LD_PREFIX=/usr/x86_64-linux-gnu
 
 # amd64 Github Actions Runner.
+ARG version=2.285.0
 RUN useradd -m actions-runner
 RUN echo "actions-runner ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 RUN echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >>/etc/sudoers
 USER actions-runner
 ENV USER=actions-runner
 WORKDIR /home/actions-runner
-RUN curl -L https://github.com/actions/runner/releases/download/v2.283.2/actions-runner-linux-x64-2.283.2.tar.gz | tar -xz
+RUN curl -L https://github.com/actions/runner/releases/download/v${version}/actions-runner-linux-x64-${version}.tar.gz | tar -xz
 VOLUME /home/actions-runner
 
 # Scripts.