Skip to content

fix: remove Cirrus CI persistent worker integration #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deekay2310 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove Cirrus CI persistent worker integration #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ In addition we can provision
The integrations allow to provision the machine and link to different CI/CD systems based on their native integrations.

* [Github Self Hosted Runner](https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners)
* [Cirrus Persistent Worker](https://cirrus-ci.org/guide/persistent-workers/)
* [GitLab Runner](docs/gitlab-runner.md)

And [Tekton tasks](tkn) are offered to dynamically provision the remote target to use within tekton pipelines
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/aws/hosts/fedora.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ func getFedoraCreate() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(params.LinuxGithubArch()),
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
Tags: viper.GetStringMapString(params.Tags),
Expand All @@ -82,7 +81,6 @@ func getFedoraCreate() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddNetworkFlags(flagSet, awsParams.ServiceEndpointsDesc)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/aws/hosts/rhel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ func getRHELCreate() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(params.LinuxGithubArch()),
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
Tags: viper.GetStringMapString(params.Tags),
Expand Down Expand Up @@ -85,7 +84,6 @@ func getRHELCreate() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddNetworkFlags(flagSet, awsParams.ServiceEndpointsDesc)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/aws/hosts/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ func getWindowsCreate() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(params.LinuxGithubArch()),
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
Tags: viper.GetStringMapString(params.Tags),
Expand Down Expand Up @@ -97,7 +96,6 @@ func getWindowsCreate() *cobra.Command {
params.AddComputeRequestFlags(flagSet)
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
params.AddNetworkFlags(flagSet, awsParams.ServiceEndpointsDesc)
c.PersistentFlags().AddFlagSet(flagSet)
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/aws/services/mac-pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ func request() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(params.LinuxGithubArch()),
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
Tags: viper.GetStringMapString(params.Tags),
Expand All @@ -193,7 +192,6 @@ func request() *cobra.Command {
flagSet.StringP(awsParams.MACOSVersion, "", awsParams.MACOSVersion, awsParams.MACOSVersionDefault)
flagSet.StringP(params.Timeout, "", "", params.TimeoutDesc)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/azure/hosts/rhel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func getCreateRHEL() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(params.LinuxGithubArch()),
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
Tags: viper.GetStringMapString(params.Tags),
Expand Down Expand Up @@ -77,7 +76,6 @@ func getCreateRHEL() *cobra.Command {
params.AddComputeRequestFlags(flagSet)
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/azure/hosts/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func getCreateWindowsDesktop() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(params.LinuxGithubArch()),
GLRunnerArgs: params.GitLabRunnerArgs(params.LinuxGitLabArch()),
Tags: viper.GetStringMapString(params.Tags),
Expand Down Expand Up @@ -89,7 +88,6 @@ func getCreateWindowsDesktop() *cobra.Command {
params.AddComputeRequestFlags(flagSet)
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/ibmcloud/hosts/ibm-power.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func ibmPowerCreate() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(&github.Ppc64le),
GLRunnerArgs: params.GitLabRunnerArgs(&gitlab.Ppc64le),
Tags: viper.GetStringMapString(params.Tags),
Expand Down Expand Up @@ -93,7 +92,6 @@ func ibmPowerCreate() *cobra.Command {
flagSet.String(params.PIStorageType, params.PIStorageTypeDefault, params.PIStorageTypeDesc)
flagSet.Int(params.PIDiskSize, params.PIDiskSizeDefault, params.PIDiskSizeDesc)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
flagSet.Int(params.GlRunnerConcurrent, params.GlRunnerConcurrentPowerDefault, params.GlRunnerConcurrentDesc)
c.PersistentFlags().AddFlagSet(flagSet)
Expand Down
2 changes: 0 additions & 2 deletions cmd/mapt/cmd/ibmcloud/hosts/ibm-z.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func ibmZCreate() *cobra.Command {
ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(&github.S390x),
GLRunnerArgs: params.GitLabRunnerArgs(&gitlab.S390x),
Tags: viper.GetStringMapString(params.Tags),
Expand Down Expand Up @@ -81,7 +80,6 @@ func ibmZCreate() *cobra.Command {
flagSet.String(params.IZProfile, params.IZProfileDefault, params.IZProfileDesc)
flagSet.Int(params.IZDiskSize, params.IZDiskSizeDefault, params.IZDiskSizeDesc)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
flagSet.Int(params.GlRunnerConcurrent, params.GlRunnerConcurrentS390xDefault, params.GlRunnerConcurrentDesc)
c.PersistentFlags().AddFlagSet(flagSet)
Expand Down
40 changes: 0 additions & 40 deletions cmd/mapt/cmd/params/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package params
import (
"os"

"github.com/redhat-developer/mapt/pkg/integrations/cirrus"
"github.com/redhat-developer/mapt/pkg/integrations/github"
"github.com/redhat-developer/mapt/pkg/integrations/gitlab"
cr "github.com/redhat-developer/mapt/pkg/provider/api/compute-request"
Expand Down Expand Up @@ -92,11 +91,6 @@ const (
ghActionsAppPrivateKey string = "ghactions-app-private-key"
ghActionsAppPrivateKeyDesc string = "Path to the GitHub App RSA private key PEM file"

cirrusPWToken string = "it-cirrus-pw-token"
cirrusPWTokenDesc string = "Add mapt target as a cirrus persistent worker. The value will hold a valid token to be used by cirrus cli to join the project."
cirrusPWLabels string = "it-cirrus-pw-labels"
cirrusPWLabelsDesc string = "additional labels to use on the persistent worker (--it-cirrus-pw-labels key1=value1,key2=value2)"

glRunnerToken string = "glrunner-token"
glRunnerTokenDesc string = "GitLab token with create_runner scope (personal access token, group/project access token, or service account token)"
glRunnerProjectID string = "glrunner-project-id"
Expand Down Expand Up @@ -425,11 +419,6 @@ func GithubRunnerDeregisterArgs(arch *github.Arch) *github.GithubRunnerArgs {
}
}

func AddCirrusFlags(fs *pflag.FlagSet) {
fs.StringP(cirrusPWToken, "", "", cirrusPWTokenDesc)
fs.StringToStringP(cirrusPWLabels, "", nil, cirrusPWLabelsDesc)
}

func AddGitLabRunnerFlags(fs *pflag.FlagSet) {
fs.StringP(glRunnerToken, "", "", glRunnerTokenDesc)
fs.StringP(glRunnerProjectID, "", "", glRunnerProjectIDDesc)
Expand All @@ -440,19 +429,6 @@ func AddGitLabRunnerFlags(fs *pflag.FlagSet) {
}


func CirrusPersistentWorkerArgs() *cirrus.PersistentWorkerArgs {
if viper.IsSet(cirrusPWToken) {
return &cirrus.PersistentWorkerArgs{
Token: viper.GetString(cirrusPWToken),
Labels: viper.GetStringMapString(cirrusPWLabels),
Platform: &cirrus.Linux,
Arch: linuxArchAsCirrusArch(
viper.GetString(LinuxArch)),
}
}
return nil
}

func GitLabRunnerArgs(arch *gitlab.Arch) *gitlab.GitLabRunnerArgs {
if viper.IsSet(glRunnerToken) {
if viper.IsSet(glRunnerProjectID) && viper.IsSet(glRunnerGroupID) {
Expand All @@ -478,14 +454,6 @@ func LinuxGitLabArch() *gitlab.Arch {
return linuxArchAsGitLabArch(viper.GetString(LinuxArch))
}

func linuxArchAsCirrusArch(arch string) *cirrus.Arch {
switch arch {
case "x86_64":
return &cirrus.Amd64
}
return &cirrus.Arm64
}

func LinuxGithubArch() *github.Arch {
return linuxArchAsGithubActionsArch(viper.GetString(LinuxArch))
}
Expand All @@ -502,14 +470,6 @@ func linuxArchAsGithubActionsArch(arch string) *github.Arch {
return &github.Arm64
}

func MACArchAsCirrusArch(arch string) *cirrus.Arch {
switch arch {
case "x86":
return &cirrus.Amd64
}
return &cirrus.Arm64
}

func linuxArchAsGitLabArch(arch string) *gitlab.Arch {
switch arch {
case "x86_64":
Expand Down
2 changes: 0 additions & 2 deletions docs/ibmcloud/ibm-power.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ Flags:
--ghactions-runner-repo string Full URL of the repository where the Github Actions Runner should be registered
--ghactions-runner-token string Token needed for registering the Github Actions Runner token
-h, --help help for create
--it-cirrus-pw-labels stringToString additional labels to use on the persistent worker (--it-cirrus-pw-labels key1=value1,key2=value2) (default [])
--it-cirrus-pw-token string Add mapt target as a cirrus persistent worker. The value will hold a valid token to be used by cirrus cli to join the project.
--otel-app-code string OpenTelemetry appcode identifier (e.g. MAPT-001); when set together with --otel-auth-token, installs the otelcol-contrib filelog collector on the instance
--otel-auth-token string OpenTelemetry authentication token (UUID) used to authenticate against the OTLP endpoint
--otel-endpoint string OTLP HTTP endpoint to export logs to (default "https://otel-input.corp.redhat.com")
Expand Down
2 changes: 0 additions & 2 deletions docs/ibmcloud/ibm-z.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ Flags:
--ghactions-runner-repo string Full URL of the repository where the Github Actions Runner should be registered
--ghactions-runner-token string Token needed for registering the Github Actions Runner token
-h, --help help for create
--it-cirrus-pw-labels stringToString additional labels to use on the persistent worker (--it-cirrus-pw-labels key1=value1,key2=value2) (default [])
--it-cirrus-pw-token string Add mapt target as a cirrus persistent worker. The value will hold a valid token to be used by cirrus cli to join the project.
--otel-app-code string OpenTelemetry appcode identifier (e.g. MAPT-001); when set together with --otel-auth-token, installs the otelcol-contrib filelog collector on the instance
--otel-auth-token string OpenTelemetry authentication token (UUID) used to authenticate against the OTLP endpoint
--otel-endpoint string OTLP HTTP endpoint to export logs to (default "https://otel-input.corp.redhat.com")
Expand Down
103 changes: 0 additions & 103 deletions pkg/integrations/cirrus/persistentworker.go
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions pkg/integrations/cirrus/snippet-darwin.sh
View file
Open in desktop

This file was deleted.

Loading