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.

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

Upgrade Fedora e2e tests with OAI to run on 41 #318

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Upgrade Fedora e2e tests with OAI to run on 41 #318

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56aa424
Upgrade Fedora e2e tests with OAI to run on 41
radoslawc Dec 6, 2024
b3b7b03
Pinning fedora image to a version, removing old instances
radoslawc Dec 9, 2024
ae8707d
Fedora-CoreOS has different default user than plain Fedora
radoslawc Dec 9, 2024
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
6 changes: 3 additions & 3 deletions .prow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ presubmits:
path: id_rsa
- key: id_rsa.pub
path: id_rsa.pub
- name: e2e-oai-fedora-34
- name: e2e-oai-fedora-41
annotations:
labels:
run_if_changed: '^e2e/'
Expand All @@ -262,8 +262,8 @@ presubmits:
args:
- "-c"
- |
set -eE; cd "$(git rev-parse --show-toplevel)/e2e/terraform"; trap 'terraform destroy -target module.gcp-fedora-34 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-34 -var="e2e_type=oai" -var="fail_fast=true" -auto-approve
set -eE; cd "$(git rev-parse --show-toplevel)/e2e/terraform"; trap 'terraform destroy -target module.gcp-fedora-41 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-41 -var="e2e_type=oai" -var="fail_fast=true" -auto-approve
volumeMounts:
- name: satoken
mountPath: "/etc/satoken"
Expand Down
4 changes: 4 additions & 0 deletions e2e/provision/distros_supported.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ fedora_34:
reload: true
project_id: fedora-cloud
family: fedora-cloud-34
fedora_41:
radoslawc marked this conversation as resolved.
Show resolved Hide resolved
name: fedora/41-cloud-base
project_id: fedora-cloud
family: fedora-cloud-41
8 changes: 8 additions & 0 deletions e2e/provision/playbooks/roles/bootstrap/molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ platforms:
gui: false
groups:
- fedora
- name: fedora41-$POSFIX_NAME
radoslawc marked this conversation as resolved.
Show resolved Hide resolved
box: generic/fedora41
memory: 8192
cpus: 4
provider_options:
gui: false
groups:
- fedora
provisioner:
name: ansible
env:
Expand Down
4 changes: 2 additions & 2 deletions e2e/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ module "gcp-fedora-34" {
nephio_mgmt_cluster_type = var.mgmt_cluster_type
}

module "gcp-fedora-38" {
module "gcp-fedora-41" {
radoslawc marked this conversation as resolved.
Show resolved Hide resolved
source = ".//modules/gcp"
vmimage = "fedora-cloud/fedora-cloud-38"
vmimage = "fedora-cloud/fedora-cloud-41"
ansible_user = "fedora"
nephio_e2e_type = var.e2e_type
nephio_e2e_fail_fast = var.fail_fast
Expand Down
8 changes: 4 additions & 4 deletions prow/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,7 +1907,7 @@ periodics:
path: id_rsa
- key: id_rsa.pub
path: id_rsa.pub
- name: e2e-daily-fedora-34-oai
- name: e2e-daily-fedora-41-oai
annotations:
labels:
cron: "0 15 * * 1-6"
Expand All @@ -1927,8 +1927,8 @@ periodics:
args:
- "-c"
- |
set -eE; cd "$GOPATH/src/nephio_repo/test-infra/e2e/terraform"; trap 'terraform destroy -target module.gcp-fedora-34 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-34 -var="e2e_type=oai" -auto-approve
set -eE; cd "$GOPATH/src/nephio_repo/test-infra/e2e/terraform"; trap 'terraform destroy -target module.gcp-fedora-41 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-41 -var="e2e_type=oai" -auto-approve
volumeMounts:
- name: satoken
mountPath: "/etc/satoken"
Expand Down Expand Up @@ -2047,4 +2047,4 @@ periodics:
- key: id_rsa
path: id_rsa
- key: id_rsa.pub
path: id_rsa.pub
path: id_rsa.pub