Skip to content

Add GitLab Runner integration #711

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

Draft
jangel97 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add GitLab Runner integration #711

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
4 changes: 3 additions & 1 deletion cmd/mapt/cmd/aws/hosts/fedora.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func getFedoraCreate() *cobra.Command {
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&fedora.FedoraArgs{
Expand All @@ -79,6 +80,7 @@ func getFedoraCreate() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -92,7 +94,7 @@ func getFedoraDestroy() *cobra.Command {
return err
}
return fedora.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
12 changes: 7 additions & 5 deletions cmd/mapt/cmd/aws/hosts/mac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func getMacRequest() *cobra.Command {
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&mac.MacRequestArgs{
Expand All @@ -67,6 +68,7 @@ func getMacRequest() *cobra.Command {
flagSet.Bool(awsParams.MACFixedLocation, false, awsParams.MACFixedLocationDesc)
flagSet.Bool(airgap, false, airgapDesc)
params.AddGHActionsFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -82,7 +84,7 @@ func getMacRelease() *cobra.Command {
}
return mac.Release(
&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
},
Expand All @@ -109,10 +111,10 @@ func getMacDestroy() *cobra.Command {
}
return mac.Destroy(
&maptContext.ContextArgs{
Context: cmd.Context(),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
KeepState: viper.IsSet(params.KeepState),
Context: cmd.Context(),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
KeepState: viper.IsSet(params.KeepState),
},
viper.GetString(awsParams.MACDHID))
},
Expand Down
16 changes: 9 additions & 7 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 @@ -52,6 +52,7 @@ func getRHELCreate() *cobra.Command {
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&rhel.RHELArgs{
Expand Down Expand Up @@ -82,6 +83,7 @@ func getRHELCreate() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -95,13 +97,13 @@ func getRHELDestroy() *cobra.Command {
return err
}
return rhel.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
KeepState: viper.IsSet(params.KeepState),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
KeepState: viper.IsSet(params.KeepState),
})
},
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/mapt/cmd/aws/hosts/rhelai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func getRHELAIDestroy() *cobra.Command {
return err
}
return rhelai.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
16 changes: 9 additions & 7 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 @@ -65,6 +65,7 @@ func getWindowsCreate() *cobra.Command {
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&windows.WindowsServerArgs{
Expand Down Expand Up @@ -93,6 +94,7 @@ func getWindowsCreate() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -106,13 +108,13 @@ func getWindowsDestroy() *cobra.Command {
return err
}
return windows.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
KeepState: viper.IsSet(params.KeepState),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
KeepState: viper.IsSet(params.KeepState),
})
},
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/mapt/cmd/aws/services/eks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ func getDestroyEKS() *cobra.Command {
}
return awsEKS.Destroy(
&maptContext.ContextArgs{
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
KeepState: viper.IsSet(params.KeepState),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
KeepState: viper.IsSet(params.KeepState),
})
},
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/mapt/cmd/aws/services/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func destroyKind() *cobra.Command {
return err
}
return kind.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
18 changes: 10 additions & 8 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 @@ -99,12 +99,12 @@ func destroyMP() *cobra.Command {
return err
}
return macpool.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
KeepState: viper.IsSet(params.KeepState),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
KeepState: viper.IsSet(params.KeepState),
})
},
}
Expand All @@ -125,7 +125,7 @@ func houseKeep() *cobra.Command {
}
return macpool.HouseKeeper(
&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Serverless: viper.IsSet(params.Serverless),
Expand Down Expand Up @@ -172,6 +172,7 @@ func request() *cobra.Command {
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&macpool.RequestMachineArgs{
Expand All @@ -191,6 +192,7 @@ func request() *cobra.Command {
flagSet.StringP(params.Timeout, "", "", params.TimeoutDesc)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -205,7 +207,7 @@ func release() *cobra.Command {
}
return macpool.Release(
&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
Expand Down
14 changes: 7 additions & 7 deletions cmd/mapt/cmd/aws/services/openshift-snc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ func destroySNC() *cobra.Command {
return err
}
return openshiftsnc.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
KeepState: viper.IsSet(params.KeepState),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
KeepState: viper.IsSet(params.KeepState),
})
},
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/mapt/cmd/azure/hosts/linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func getDestroyLinux() *cobra.Command {
return err
}
return azureLinux.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
4 changes: 3 additions & 1 deletion cmd/mapt/cmd/azure/hosts/rhel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func getCreateRHEL() *cobra.Command {
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&azureRHEL.RhelArgs{
Expand Down Expand Up @@ -77,6 +78,7 @@ func getCreateRHEL() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -90,7 +92,7 @@ func getDestroyRHEL() *cobra.Command {
return err
}
return azureRHEL.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
4 changes: 3 additions & 1 deletion cmd/mapt/cmd/azure/hosts/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func getCreateWindowsDesktop() *cobra.Command {
DebugLevel: viper.GetUint(params.DebugLevel),
CirrusPWArgs: params.CirrusPersistentWorkerArgs(),
GHRunnerArgs: params.GithubRunnerArgs(),
GLRunnerArgs: params.GitLabRunnerArgs(),
Tags: viper.GetStringMapString(params.Tags),
},
&azureWindows.WindowsArgs{
Expand Down Expand Up @@ -89,6 +90,7 @@ func getCreateWindowsDesktop() *cobra.Command {
params.AddSpotFlags(flagSet)
params.AddGHActionsFlags(flagSet)
params.AddCirrusFlags(flagSet)
params.AddGitLabRunnerFlags(flagSet)
c.PersistentFlags().AddFlagSet(flagSet)
return c
}
Expand All @@ -102,7 +104,7 @@ func getDestroyWindowsDesktop() *cobra.Command {
return err
}
if err := azureWindows.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
2 changes: 1 addition & 1 deletion cmd/mapt/cmd/azure/services/aks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func getDestroyAKS() *cobra.Command {
return err
}
return azureAKS.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
Expand Down
14 changes: 7 additions & 7 deletions cmd/mapt/cmd/azure/services/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ func destroyKind() *cobra.Command {
return err
}
return kind.Destroy(&maptContext.ContextArgs{
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
ForceDestroy: viper.IsSet(params.ForceDestroy),
Context: cmd.Context(),
ProjectName: viper.GetString(params.ProjectName),
BackedURL: viper.GetString(params.BackedURL),
Debug: viper.IsSet(params.Debug),
DebugLevel: viper.GetUint(params.DebugLevel),
Serverless: viper.IsSet(params.Serverless),
ForceDestroy: viper.IsSet(params.ForceDestroy),
})
},
}
Expand Down
Loading
Loading