-
Notifications
You must be signed in to change notification settings - Fork 224
[USHIFT-2971] EL94 Periodics #3353
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
Merged
openshift-merge-bot
merged 1 commit into
openshift:main
from
copejon:ushift-2970-rhel-94-periodics
Jun 4, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml
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 @@ | ||
| name = "rhel-9.3-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}" | ||
| description = "RHEL 9.3 with MicroShift from two minor versions back installed." | ||
| version = "0.0.1" | ||
| modules = [] | ||
| groups = [] | ||
| distro = "rhel-93" | ||
|
|
||
| [[packages]] | ||
| name = "microshift" | ||
| version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-greenboot" | ||
| version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-networking" | ||
| version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-selinux" | ||
| version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-test-agent" | ||
| version = "*" | ||
|
|
||
| [customizations.services] | ||
| enabled = ["microshift", "microshift-test-agent"] | ||
|
|
||
| [customizations.firewall] | ||
| ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"] | ||
|
|
||
| [customizations.firewall.services] | ||
| enabled = ["mdns", "ssh", "http", "https"] | ||
|
|
||
| [[customizations.firewall.zones]] | ||
| name = "trusted" | ||
| sources = ["10.42.0.0/16", "169.254.169.1"] |
66 changes: 66 additions & 0 deletions
66
test/image-blueprints/layer3-periodic/group1/rhel94-crel-with-optionals.toml
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,66 @@ | ||
| {{- if env.Getenv "CURRENT_RELEASE_VERSION" "" -}} | ||
| {{- /* | ||
|
|
||
| We wrap this template in a test so that the body of the output is | ||
| empty when there is no "current" version release. The output file | ||
| must end up completely empty, so we need to remove whitespace from | ||
| around the first and last template instructions. | ||
|
|
||
| */ -}} | ||
|
|
||
| name = "rhel-9.4-microshift-crel-optionals" | ||
| description = "A RHEL 9.4 image with already built and released RPMs like EC, RC, or Z-stream release" | ||
| version = "0.0.1" | ||
| modules = [] | ||
| groups = [] | ||
| distro = "rhel-94" | ||
|
|
||
| [[packages]] | ||
| name = "microshift" | ||
| version = "{{ .Env.CURRENT_RELEASE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-greenboot" | ||
| version = "{{ .Env.CURRENT_RELEASE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-networking" | ||
| version = "{{ .Env.CURRENT_RELEASE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-selinux" | ||
| version = "{{ .Env.CURRENT_RELEASE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-olm" | ||
| version = "{{ .Env.CURRENT_RELEASE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-multus" | ||
| version = "{{ .Env.CURRENT_RELEASE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-test-agent" | ||
| version = "*" | ||
|
|
||
| [customizations.services] | ||
| enabled = ["microshift", "microshift-test-agent"] | ||
|
|
||
| [customizations.firewall] | ||
| ports = [ | ||
| "22:tcp", | ||
| "80:tcp", | ||
| "443:tcp", | ||
| "5353:udp", | ||
| "6443:tcp", | ||
| "30000-32767:tcp", | ||
| "30000-32767:udp", | ||
| ] | ||
|
|
||
| [customizations.firewall.services] | ||
| enabled = ["mdns", "ssh", "http", "https"] | ||
|
|
||
| [[customizations.firewall.zones]] | ||
| name = "trusted" | ||
| sources = ["10.42.0.0/16", "169.254.169.1"] | ||
| {{- end -}} |
51 changes: 51 additions & 0 deletions
51
test/image-blueprints/layer3-periodic/group1/rhel94-source-with-optionals.toml
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,51 @@ | ||
| name = "rhel-9.4-microshift-source-optionals" | ||
| description = "A RHEL 9.4 image with MicroShift and OLM built from source." | ||
| version = "0.0.1" | ||
| modules = [] | ||
| groups = [] | ||
| distro = "rhel-94" | ||
|
|
||
| [[packages]] | ||
| name = "microshift" | ||
| version = "{{ .Env.SOURCE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-greenboot" | ||
| version = "{{ .Env.SOURCE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-networking" | ||
| version = "{{ .Env.SOURCE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-selinux" | ||
| version = "{{ .Env.SOURCE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-olm" | ||
| version = "{{ .Env.SOURCE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-multus" | ||
| version = "{{ .Env.SOURCE_VERSION }}" | ||
|
|
||
| [[packages]] | ||
| name = "microshift-test-agent" | ||
| version = "*" | ||
|
|
||
| [[packages]] | ||
| name = "systemd-resolved" | ||
| version = "*" | ||
|
|
||
| [customizations.services] | ||
| enabled = ["microshift", "microshift-test-agent"] | ||
|
|
||
| [customizations.firewall] | ||
| ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"] | ||
|
|
||
| [customizations.firewall.services] | ||
| enabled = ["mdns", "ssh", "http", "https"] | ||
|
|
||
| [[customizations.firewall.zones]] | ||
| name = "trusted" | ||
| sources = ["10.42.0.0/16", "169.254.169.1"] |
File renamed without changes.
File renamed without changes.
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
23 changes: 23 additions & 0 deletions
23
test/scenarios-periodics/el92-prel@el94-crel@upgrade-ok.sh.pending_crel
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,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from cleanup_scenario.sh and uses functions defined there. | ||
|
|
||
| scenario_create_vms() { | ||
| # Determine the starting image based on the source tree current | ||
| # version, minus one. | ||
| local start_image | ||
| start_image="rhel-9.2-microshift-4.$(previous_minor_version)" | ||
|
|
||
| prepare_kickstart host1 kickstart.ks.template "${start_image}" | ||
| launch_vm host1 rhel-9.2 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| run_tests host1 \ | ||
| --variable "TARGET_REF:rhel-9.4-microshift-crel" \ | ||
| suites/upgrade/upgrade-successful.robot | ||
| } |
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,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from cleanup_scenario.sh and uses functions defined there. | ||
|
|
||
| scenario_create_vms() { | ||
| # Determine the starting image based on the source tree current | ||
| # version, minus one. | ||
| local start_image | ||
| start_image="rhel-9.2-microshift-4.$(previous_minor_version)" | ||
|
|
||
| prepare_kickstart host1 kickstart.ks.template "${start_image}" | ||
| launch_vm host1 rhel-9.2 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| run_tests host1 \ | ||
| --variable "TARGET_REF:rhel-9.4-microshift-source" \ | ||
| suites/upgrade/upgrade-successful.robot | ||
| } |
23 changes: 23 additions & 0 deletions
23
test/scenarios-periodics/el92-yminus2@el94-crel@upgrade-ok.sh.pending_crel
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,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from scenario.sh and uses functions defined there. | ||
|
|
||
| scenario_create_vms() { | ||
| # Determine the starting image based on the source tree current | ||
| # version, minus one. | ||
| local start_image | ||
| start_image="rhel-9.2-microshift-4.$(yminus2_minor_version)" | ||
|
|
||
| prepare_kickstart host1 kickstart.ks.template "${start_image}" | ||
| launch_vm host1 rhel-9.2 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| run_tests host1 \ | ||
| --variable "TARGET_REF:rhel-9.4-microshift-crel" \ | ||
| suites/upgrade/upgrade-successful.robot | ||
| } |
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
test/scenarios-periodics/el93-prel@el94-crel@upgrade-ok.sh.pending_crel
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,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from cleanup_scenario.sh and uses functions defined there. | ||
|
|
||
| scenario_create_vms() { | ||
| # Determine the starting image based on the source tree current | ||
| # version, minus one. | ||
| local start_image | ||
| start_image="rhel-9.3-microshift-4.$(previous_minor_version)" | ||
|
|
||
| prepare_kickstart host1 kickstart.ks.template "${start_image}" | ||
| launch_vm host1 rhel-9.3 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| run_tests host1 \ | ||
| --variable "TARGET_REF:rhel-9.4-microshift-crel" \ | ||
| suites/upgrade/upgrade-successful.robot | ||
| } |
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,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Sourced from cleanup_scenario.sh and uses functions defined there. | ||
|
|
||
| scenario_create_vms() { | ||
| # Determine the starting image based on the source tree current | ||
| # version, minus one. | ||
| local start_image | ||
| start_image="rhel-9.3-microshift-4.$(previous_minor_version)" | ||
|
|
||
| prepare_kickstart host1 kickstart.ks.template "${start_image}" | ||
| launch_vm host1 rhel-9.3 | ||
| } | ||
|
|
||
| scenario_remove_vms() { | ||
| remove_vm host1 | ||
| } | ||
|
|
||
| scenario_run_tests() { | ||
| run_tests host1 \ | ||
| --variable "TARGET_REF:rhel-9.4-microshift-source" \ | ||
| suites/upgrade/upgrade-successful.robot | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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.
On line 7
DEFAULT_BOOT_BLUEPRINTto userhel-9.4in scenario.sh