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 4 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 all commits
Commits
Show all changes
4 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
4d4f971
Merge branch 'main' into fedora40_e2e
efiacor Feb 24, 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
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
6 changes: 3 additions & 3 deletions e2e/provision/distros_supported.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ubuntu_jammy:
name: generic/ubuntu2204
project_id: ubuntu-os-cloud
family: ubuntu-2204-lts
fedora_34:
name: fedora/34-cloud-base
fedora_41:
name: fedora/41-cloud-base
reload: true
project_id: fedora-cloud
family: fedora-cloud-34
family: fedora-cloud-41
4 changes: 2 additions & 2 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 @@ -37,8 +37,8 @@ platforms:
gui: false
groups:
- ubuntu
- name: fedora34-$POSFIX_NAME
box: generic/fedora34
- name: fedora41-$POSFIX_NAME
box: generic/fedora41
memory: 8192
cpus: 4
provider_options:
Expand Down
15 changes: 3 additions & 12 deletions e2e/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,10 @@ module "gcp-ubuntu-jammy" {
nephio_mgmt_cluster_type = var.mgmt_cluster_type
}

module "gcp-fedora-34" {
module "gcp-fedora-41" {
source = ".//modules/gcp"
vmimage = "fedora-cloud/fedora-cloud-34"
ansible_user = "fedora"
nephio_e2e_type = var.e2e_type
nephio_e2e_fail_fast = var.fail_fast
nephio_mgmt_cluster_type = var.mgmt_cluster_type
}

module "gcp-fedora-38" {
source = ".//modules/gcp"
vmimage = "fedora-cloud/fedora-cloud-38"
ansible_user = "fedora"
vmimage = "fedora-coreos-cloud/fedora-coreos-41-20241109-3-0-gcp-x86-64"
ansible_user = "core"
nephio_e2e_type = var.e2e_type
nephio_e2e_fail_fast = var.fail_fast
nephio_mgmt_cluster_type = var.mgmt_cluster_type
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 @@ -2048,7 +2048,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 @@ -2068,8 +2068,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 @@ -2235,4 +2235,4 @@ periodics:
- key: id_rsa
path: id_rsa
- key: id_rsa.pub
path: id_rsa.pub
path: id_rsa.pub