Migrate upgrade tests to use new framework #4519
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package upgrade | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| testlib "knative.dev/eventing/test/lib" | ||
| "knative.dev/eventing/test/upgrade/prober" | ||
| pkgupgrade "knative.dev/pkg/test/upgrade" | ||
| ) | ||
|
|
||
| func ContinualTest() pkgupgrade.BackgroundOperation { | ||
| ctx := context.Background() | ||
| var client *testlib.Client | ||
| var probe prober.Prober | ||
| return pkgupgrade.NewBackgroundVerification("EventingContinualTest", | ||
| func(c pkgupgrade.Context) { | ||
| // setup | ||
| client = testlib.Setup(c.T, false) | ||
| config := prober.NewConfig(client.Namespace) | ||
| probe = prober.RunEventProber(ctx, c.Log, client, config) | ||
| }, | ||
| func(c pkgupgrade.Context) { | ||
| // verify | ||
| defer testlib.TearDown(client) | ||
| prober.AssertEventProber(ctx, c.T, probe) | ||
| }, | ||
| ) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package installation | ||
|
|
||
| import ( | ||
| pkgupgrade "knative.dev/pkg/test/upgrade" | ||
| ) | ||
|
|
||
| func GitHead() pkgupgrade.Operation { | ||
| return pkgupgrade.NewOperation("EventingGitHead", func(c pkgupgrade.Context) { | ||
| ops := []string{ | ||
| "install_head", | ||
| "install_channel_crds", | ||
| "install_mt_broker", | ||
| "install_sugar", | ||
| } | ||
|
Comment on lines
+25
to
+30
Contributor
There was a problem hiding this comment. I am a little bit concerned about this as sometimes there may be hacky code in bash script to install it properly, eg waiting to make sure all the pods in the previous step are running before applying next. I am wondering if there is a bash function that does all these installations and we can just call the bash function instead. But for sure we can change it later if such a bash function is required.
Contributor
Author
There was a problem hiding this comment. There are no such function. Each of those functions has appropriate waits built inside, so it isn't needed. Current code executes them directly: https://github.com/knative/eventing/pull/4519/files#diff-1c4d417537c9878a5068005f79761334318400204068c4dfd4a7656226bfefe1L61-L64 |
||
| for _, shellfunc := range ops { | ||
| c.Log.Info("Running shell function: ", shellfunc) | ||
| err := callShellFunction(shellfunc) | ||
| if err != nil { | ||
| c.T.Error(err) | ||
|
Contributor
There was a problem hiding this comment. Should this be
Contributor
Author
There was a problem hiding this comment. It will break operations, yeah. |
||
| return | ||
| } | ||
| } | ||
| }) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package installation | ||
|
Contributor
There was a problem hiding this comment. I wonder if we can just use
Contributor
Author
There was a problem hiding this comment. I used That's why I think |
||
|
|
||
| import ( | ||
| pkgupgrade "knative.dev/pkg/test/upgrade" | ||
| ) | ||
|
|
||
| func LatestStable() pkgupgrade.Operation { | ||
| return pkgupgrade.NewOperation("EventingLatestRelease", func(c pkgupgrade.Context) { | ||
| shellfunc := "install_latest_release" | ||
| c.Log.Info("Running shell function: ", shellfunc) | ||
| err := callShellFunction(shellfunc) | ||
| if err != nil { | ||
| c.T.Error(err) | ||
| return | ||
| } | ||
| }) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package installation | ||
|
|
||
| import ( | ||
| "knative.dev/hack/shell" | ||
| ) | ||
|
|
||
| func callShellFunction(funcName string) error { | ||
| loc, err := shell.NewProjectLocation("../../..") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| exec := shell.NewExecutor(shell.ExecutorConfig{ | ||
| ProjectLocation: loc, | ||
| }) | ||
| fn := shell.Function{ | ||
| Script: shell.Script{ | ||
| Label: funcName, | ||
| ScriptPath: "test/e2e-common.sh", | ||
| }, | ||
| FunctionName: funcName, | ||
| } | ||
| return exec.RunFunction(fn) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package upgrade | ||
|
|
||
| import ( | ||
| pkgupgrade "knative.dev/pkg/test/upgrade" | ||
| ) | ||
|
|
||
| func PostDowngradeTest() pkgupgrade.Operation { | ||
| return pkgupgrade.NewOperation("EventingPostDowngradeTest", func(c pkgupgrade.Context) { | ||
| runSmokeTest(c.T) | ||
| }) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what was the issue here @cardil ? just curious
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When using strict bash setting of
set -Eeuo pipefailthat fails because of-u: fail on unset variable being dereferenced.Bash could know if variable is unset or empty.