Skip to content

Fail cloude2e step if tests can't run, fix image publication #5000

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

Merged
michel-laterman merged 5 commits into from
Jun 3, 2025
Merged

Fail cloude2e step if tests can't run, fix image publication #5000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27a15f0
Fail cloude2e step if tests can't run, fix image publication
michel-laterman Jun 3, 2025
dc815ad
remove extra env var set
michel-laterman Jun 3, 2025
a2a196f
Merge branch 'main' into fix-push-image-cloude2e
michel-laterman Jun 3, 2025
f446e6f
Update magefile.go
michel-laterman Jun 3, 2025
f8892c3
Merge branch 'main' into fix-push-image-cloude2e
michel-laterman Jun 3, 2025
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
2 changes: 1 addition & 1 deletion .buildkite/scripts/cloud_e2e_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [[ "${FLEET_SERVER_URL}" == "" ]]; then
--style "error"
fi
echo "${message}"
exit 0
exit 1
fi

echo "--- Trigger cloud E2E test"
Expand Down
5 changes: 4 additions & 1 deletion magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,7 @@ func (Docker) Cover() error {
// DEV creates a development image.
// SNAPSHOT creates a snapshot image.
// VERSION_QUALIFIER may be used to manually specify a version qualifer for the image tag.
// DOCKER_IMAGE may be used to completely specify the image name.
// DOCKER_IMAGE_TAG may be used to completely specify the image tag.
func (Docker) Image() error {
dockerFile := "Dockerfile"
Expand All @@ -982,6 +983,9 @@ func (Docker) Image() error {
dockerFile = dockerBuilderFIPS
image += "-fips"
}
if v, ok := os.LookupEnv(envDockerImage); ok && v != "" {
image = v
}

return sh.RunWithV(map[string]string{"DOCKER_BUILDKIT": "1"}, "docker", "build",
"--build-arg", "GO_VERSION="+getGoVersion(),
Expand Down Expand Up @@ -1615,7 +1619,6 @@ func (Test) Benchstat() error {
func (Test) E2e() {
os.Setenv(envDev, "true")
os.Setenv(envSnapshot, "true")
os.Setenv(envDockerImage, "fleet-server-e2e-agent")

// Set PLATFORMS to linux/$GOARCH + a binary for the local system
pList := []string{
Expand Down
Loading