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

Enable Fedora 38 support to OAI test case #260

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −6
Open

Enable Fedora 38 support to OAI test case #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-38
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-38 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-38 -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_38:
name: fedora/38-cloud-base
project_id: fedora-cloud
family: fedora-cloud-38
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: fedora38-$POSFIX_NAME
box: generic/fedora38
memory: 8192
cpus: 4
provider_options:
gui: false
groups:
- fedora
provisioner:
name: ansible
env:
Expand Down
8 changes: 8 additions & 0 deletions e2e/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ module "gcp-fedora-34" {
nephio_e2e_fail_fast = var.fail_fast
}

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

variable "e2e_type" {
description = "The End-to-End testing type"
default = "free5gc"
Expand Down
6 changes: 3 additions & 3 deletions prow/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ periodics:
path: id_rsa
- key: id_rsa.pub
path: id_rsa.pub
- name: e2e-daily-oai-fedora-34
- name: e2e-daily-oai-fedora-38
annotations:
labels:
cron: "0 15 * * 1-6"
Expand All @@ -1614,8 +1614,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-38 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-38 -var="e2e_type=oai" -auto-approve
volumeMounts:
- name: satoken
mountPath: "/etc/satoken"
Expand Down