Skip to content
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.

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

Remove stack image defintion feature and fix image overrides #6997

Merged
merged 4 commits into from
Jul 10, 2023

Conversation

pebrc
Copy link
Collaborator

@pebrc pebrc commented Jul 10, 2023

Remove the unused stack versions feature from the e2e code.
Reset the image when setting the version so that stateful builder code won't keep an image digest for a version previously set (see current test failures)

// pseudo code
newBuilder {
.setVersion("8.9.0-SNPSHOT")
}
// version: "8.9.0-SNAPSHOT"
// image: docker.elastic.co/elasticsearch/elasticsearch@sha256:39599c71bd7446fc3c38f22462ba5c86ce65813c4ec38eb3b71bb876061351d4

b.setVersion("8.8.0")
// version: "8.8.0"
// image: docker.elastic.co/elasticsearch/elasticsearch@sha256:39599c71bd7446fc3c38f22462ba5c86ce65813c4ec38eb3b71bb876061351d4


// test is not actually running 8.8.0 at this point but still 8.9.0-SNAPSHOT

@botelastic botelastic bot added the triage label Jul 10, 2023
@pebrc pebrc added >test Related to unit/integration/e2e tests v2.9.0 and removed triage labels Jul 10, 2023
@pebrc
Copy link
Collaborator Author

pebrc commented Jul 10, 2023

buildkite test this -f p=gke,E2E_STACK_VERSION=8.9.0-SNAPSHOT,t=TestVersionUpgradeTwoNodesToLatest8x

@thbkrkr
Copy link
Contributor

thbkrkr commented Jul 10, 2023

buildkite test this -f p=gke,s=8.9.0-SNAPSHOT,t=TestVersionUpgradeTwoNodesToLatest8x

@thbkrkr
Copy link
Contributor

thbkrkr commented Jul 10, 2023

I spotted a small bug in the way we detect if we build eck-dev to perform e2e tests against SNAPSHOT stack versions. I did the bad assumption that we would write in the comment "s=8.9.0-SNAPSHOT" (the version with the shortcut) while we must also support "E2E_STACK_VERSION =8.9.0-SNAPSHOT".

is_pr-comment-test-snapshot() {
[[ "${GITHUB_PR_TRIGGER_COMMENT:-}" =~ s=[0-9\.]*-SNAPSHOT ]]
}

*-test-snapshot) BUILD_FLAVORS="eck,eck-dev" ;;
pr-*|merge-xyz) BUILD_FLAVORS="eck" ;;

Copy link
Contributor

@thbkrkr thbkrkr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pebrc pebrc merged commit 67a4086 into elastic:main Jul 10, 2023
pebrc added a commit to pebrc/cloud-on-k8s that referenced this pull request Jul 10, 2023
…#6997)

Remove the unused stack versions feature from the e2e code.
Reset the image when setting the version so that stateful builder code won't keep an image digest for a version previously set (see current test failures)

// pseudo code
newBuilder {
.setVersion("8.9.0-SNPSHOT")
}
// version: "8.9.0-SNAPSHOT"
// image: docker.elastic.co/elasticsearch/elasticsearch@sha256:39599c71bd7446fc3c38f22462ba5c86ce65813c4ec38eb3b71bb876061351d4

b.setVersion("8.8.0")
// version: "8.8.0"
// image: docker.elastic.co/elasticsearch/elasticsearch@sha256:39599c71bd7446fc3c38f22462ba5c86ce65813c4ec38eb3b71bb876061351d4

// test is not actually running 8.8.0 at this point but still 8.9.0-SNAPSHOT

Co-authored-by: Thibault Richard <[email protected]>
(cherry picked from commit 67a4086)

# Conflicts:
#	docs/reference/dependencies.asciidoc
#	go.mod
@pebrc
Copy link
Collaborator Author

pebrc commented Jul 10, 2023

💚 All backports created successfully

Status Branch Result
2.9

Questions ?

Please refer to the Backport tool documentation

pebrc added a commit that referenced this pull request Jul 10, 2023
…6999)

Remove the unused stack versions feature from the e2e code.
Reset the image when setting the version so that stateful builder code won't keep an image digest for a version previously set (see current test failures)

// pseudo code
newBuilder {
.setVersion("8.9.0-SNPSHOT")
}
// version: "8.9.0-SNAPSHOT"
// image: docker.elastic.co/elasticsearch/elasticsearch@sha256:39599c71bd7446fc3c38f22462ba5c86ce65813c4ec38eb3b71bb876061351d4

b.setVersion("8.8.0")
// version: "8.8.0"
// image: docker.elastic.co/elasticsearch/elasticsearch@sha256:39599c71bd7446fc3c38f22462ba5c86ce65813c4ec38eb3b71bb876061351d4

// test is not actually running 8.8.0 at this point but still 8.9.0-SNAPSHOT

Co-authored-by: Thibault Richard <[email protected]>
(cherry picked from commit 67a4086)

# Conflicts:
#	docs/reference/dependencies.asciidoc
#	go.mod
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>test Related to unit/integration/e2e tests v2.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants