Merge pull request #4778 from fluxcd/int-run-check

tests/integration: Run flux check after installation
pull/4779/head
Stefan Prodan 8 months ago committed by GitHub
commit 55728ce6d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -53,6 +53,9 @@ const (
// kubeconfigPath is the path of the file containing the kubeconfig // kubeconfigPath is the path of the file containing the kubeconfig
kubeconfigPath = "./build/kubeconfig" kubeconfigPath = "./build/kubeconfig"
// fluxBin is the path to the flux binary.
fluxBin = "./build/flux"
// default branch to be used when cloning git repositories // default branch to be used when cloning git repositories
defaultBranch = "main" defaultBranch = "main"
@ -291,6 +294,13 @@ func TestMain(m *testing.M) {
panic(fmt.Sprintf("error installing Flux: %v", err)) panic(fmt.Sprintf("error installing Flux: %v", err))
} }
// On check failure, log and continue. Controllers may be ready by the time
// tests run.
log.Println("Running flux check")
if err := runFluxCheck(ctx); err != nil {
log.Printf("flux check failed: %v\n", err)
}
log.Println("Running e2e tests") log.Println("Running e2e tests")
exitCode = m.Run() exitCode = m.Run()
} }

@ -92,17 +92,24 @@ func installFlux(ctx context.Context, tmpDir string, kubeconfigPath string) erro
bootstrapArgs = fmt.Sprintf("--token-auth --password=%s", cfg.gitPat) bootstrapArgs = fmt.Sprintf("--token-auth --password=%s", cfg.gitPat)
} }
bootstrapCmd := fmt.Sprintf("./build/flux bootstrap git --url=%s %s --kubeconfig=%s --path=clusters/e2e "+ bootstrapCmd := fmt.Sprintf("%s bootstrap git --url=%s %s --kubeconfig=%s --path=clusters/e2e "+
" --components-extra image-reflector-controller,image-automation-controller", " --components-extra image-reflector-controller,image-automation-controller",
repoURL, bootstrapArgs, kubeconfigPath) fluxBin, repoURL, bootstrapArgs, kubeconfigPath)
return tftestenv.RunCommand(ctx, "./", bootstrapCmd, tftestenv.RunCommandOptions{ return tftestenv.RunCommand(ctx, "./", bootstrapCmd, tftestenv.RunCommandOptions{
Timeout: 15 * time.Minute, Timeout: 15 * time.Minute,
}) })
} }
func runFluxCheck(ctx context.Context) error {
checkCmd := fmt.Sprintf("%s check --kubeconfig %s", fluxBin, kubeconfigPath)
return tftestenv.RunCommand(ctx, "./", checkCmd, tftestenv.RunCommandOptions{
AttachConsole: true,
})
}
func uninstallFlux(ctx context.Context) error { func uninstallFlux(ctx context.Context) error {
uninstallCmd := fmt.Sprintf("./build/flux uninstall --kubeconfig %s -s", kubeconfigPath) uninstallCmd := fmt.Sprintf("%s uninstall --kubeconfig %s -s", fluxBin, kubeconfigPath)
if err := tftestenv.RunCommand(ctx, "./", uninstallCmd, tftestenv.RunCommandOptions{ if err := tftestenv.RunCommand(ctx, "./", uninstallCmd, tftestenv.RunCommandOptions{
Timeout: 15 * time.Minute, Timeout: 15 * time.Minute,
}); err != nil { }); err != nil {

Loading…
Cancel
Save