Skip to content

Commit fe9179e

Browse files
deekay2310deekay2310
committed
feat(ibmcloud): add GitHub Actions runner support for IBM Power and IBM Z
1 parent ce74314 commit fe9179e

838 files changed

Lines changed: 78196 additions & 55849 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-oci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
remove_haskell: true
4141
rm_cmd: "rmz"
4242
- name: Checkout code
43-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
43+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4444
- name: Install Podman (only for arm64)
4545
if: contains(matrix.os, 'arm')
4646
run: |
@@ -121,7 +121,7 @@ jobs:
121121
runs-on: ubuntu-24.04
122122
steps:
123123
- name: Checkout code
124-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
124+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
125125
- name: Set version from tag
126126
if: startsWith(github.ref, 'refs/tags/')
127127
run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV

‎.github/workflows/smoke-test-s390x.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: s390x Runner Smoke Test
2+
on: workflow_dispatch
3+
jobs:
4+
smoke-test:
5+
runs-on: [self-hosted, S390X]
6+
steps:
7+
- name: Check architecture
8+
run: |
9+
echo "Architecture: $(uname -m)"
10+
cat /etc/os-release | grep PRETTY_NAME
11+
echo "Runner is alive on $(arch)"

‎Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ TKN_IMG ?= quay.io/redhat-developer/mapt:v${VERSION}-tkn
77

88
# Integrations
99
# renovate: datasource=github-releases depName=cirruslabs/cirrus-cli
10-
CIRRUS_CLI ?= v0.165.2
10+
CIRRUS_CLI ?= v1.0.0
1111
# renovate: datasource=github-releases depName=actions/runner
1212
GITHUB_RUNNER ?= 2.334.0
1313
# renovate: datasource=gitlab-releases depName=gitlab-org/gitlab-runner
14-
GITLAB_RUNNER ?= 19.0.0
14+
GITLAB_RUNNER ?= 19.0.1
1515
# renovate: datasource=github-releases depName=open-telemetry/opentelemetry-collector-releases
1616
OTELCOL_VERSION ?= 0.151.0
1717

@@ -28,8 +28,7 @@ VERSION_VARIABLES := -X $(MODULEPATH)/pkg/manager/context.OCI=$(IMG) \
2828
-X $(MODULEPATH)/pkg/integrations/cirrus.version=$(CIRRUS_CLI) \
2929
-X $(MODULEPATH)/pkg/integrations/github.runnerVersion=$(GITHUB_RUNNER) \
3030
-X $(MODULEPATH)/pkg/integrations/gitlab.version=$(GITLAB_RUNNER) \
31-
-X $(MODULEPATH)/pkg/provider/ibmcloud/action/ibm-power.otelColVersion=$(OTELCOL_VERSION) \
32-
-X $(MODULEPATH)/pkg/provider/ibmcloud/action/ibm-z.otelColVersion=$(OTELCOL_VERSION)
31+
-X $(MODULEPATH)/pkg/integrations/otelcol.version=$(OTELCOL_VERSION)
3332
LDFLAGS := $(VERSION_VARIABLES) ${GO_EXTRA_LDFLAGS}
3433
GCFLAGS := all=-N -l
3534
GOOS := $(shell go env GOOS)

‎cmd/mapt/cmd/aws/hosts/fedora.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func getFedoraCreate() *cobra.Command {
5757
DebugLevel: viper.GetUint(params.DebugLevel),
5858
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
5959
GHRunnerArgs: params.GithubRunnerArgs(),
60-
GLRunnerArgs: params.GitLabRunnerArgs(),
60+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
6161
Tags: viper.GetStringMapString(params.Tags),
6262
},
6363
&fedora.FedoraArgs{

‎cmd/mapt/cmd/aws/hosts/mac.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func getMacRequest() *cobra.Command {
4848
Debug: viper.IsSet(params.Debug),
4949
DebugLevel: viper.GetUint(params.DebugLevel),
5050
GHRunnerArgs: params.GithubRunnerArgs(),
51-
GLRunnerArgs: params.GitLabRunnerArgs(),
51+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
5252
Tags: viper.GetStringMapString(params.Tags),
5353
},
5454
&mac.MacRequestArgs{

‎cmd/mapt/cmd/aws/hosts/rhel.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func getRHELCreate() *cobra.Command {
5353
DebugLevel: viper.GetUint(params.DebugLevel),
5454
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
5555
GHRunnerArgs: params.GithubRunnerArgs(),
56-
GLRunnerArgs: params.GitLabRunnerArgs(),
56+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
5757
Tags: viper.GetStringMapString(params.Tags),
5858
},
5959
&rhel.RHELArgs{

‎cmd/mapt/cmd/aws/hosts/windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func getWindowsCreate() *cobra.Command {
6666
DebugLevel: viper.GetUint(params.DebugLevel),
6767
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
6868
GHRunnerArgs: params.GithubRunnerArgs(),
69-
GLRunnerArgs: params.GitLabRunnerArgs(),
69+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
7070
Tags: viper.GetStringMapString(params.Tags),
7171
},
7272
&windows.WindowsServerArgs{

‎cmd/mapt/cmd/aws/services/mac-pool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func request() *cobra.Command {
174174
DebugLevel: viper.GetUint(params.DebugLevel),
175175
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
176176
GHRunnerArgs: params.GithubRunnerArgs(),
177-
GLRunnerArgs: params.GitLabRunnerArgs(),
177+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
178178
Tags: viper.GetStringMapString(params.Tags),
179179
},
180180
&macpool.RequestMachineArgs{

‎cmd/mapt/cmd/azure/hosts/rhel.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func getCreateRHEL() *cobra.Command {
4949
DebugLevel: viper.GetUint(params.DebugLevel),
5050
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
5151
GHRunnerArgs: params.GithubRunnerArgs(),
52-
GLRunnerArgs: params.GitLabRunnerArgs(),
52+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
5353
Tags: viper.GetStringMapString(params.Tags),
5454
},
5555
&azureRHEL.RhelArgs{

‎cmd/mapt/cmd/azure/hosts/windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func getCreateWindowsDesktop() *cobra.Command {
6262
DebugLevel: viper.GetUint(params.DebugLevel),
6363
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
6464
GHRunnerArgs: params.GithubRunnerArgs(),
65-
GLRunnerArgs: params.GitLabRunnerArgs(),
65+
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
6666
Tags: viper.GetStringMapString(params.Tags),
6767
},
6868
&azureWindows.WindowsArgs{

0 commit comments

Comments
 (0)