From 9613c51a697c86ea43bab7c42c77717c46181139 Mon Sep 17 00:00:00 2001
From: Victor Morales <v.morales@samsung.com>
Date: Fri, 26 Apr 2024 09:16:05 -0700
Subject: [PATCH] Add fedora38 support

Signed-off-by: Victor Morales <v.morales@samsung.com>
---
 .prow.yaml                                                | 6 +++---
 e2e/provision/distros_supported.yml                       | 4 ++++
 .../roles/bootstrap/molecule/default/molecule.yml         | 8 ++++++++
 e2e/terraform/main.tf                                     | 8 ++++++++
 prow/config/config.yaml                                   | 6 +++---
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/.prow.yaml b/.prow.yaml
index 08ccaf0f..c25eb381 100644
--- a/.prow.yaml
+++ b/.prow.yaml
@@ -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/'
@@ -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"
diff --git a/e2e/provision/distros_supported.yml b/e2e/provision/distros_supported.yml
index 8aaa96c1..3212b1b7 100644
--- a/e2e/provision/distros_supported.yml
+++ b/e2e/provision/distros_supported.yml
@@ -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
diff --git a/e2e/provision/playbooks/roles/bootstrap/molecule/default/molecule.yml b/e2e/provision/playbooks/roles/bootstrap/molecule/default/molecule.yml
index 8c6ddae8..5a941712 100644
--- a/e2e/provision/playbooks/roles/bootstrap/molecule/default/molecule.yml
+++ b/e2e/provision/playbooks/roles/bootstrap/molecule/default/molecule.yml
@@ -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:
diff --git a/e2e/terraform/main.tf b/e2e/terraform/main.tf
index 2ec206e5..4b8797f0 100644
--- a/e2e/terraform/main.tf
+++ b/e2e/terraform/main.tf
@@ -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"
diff --git a/prow/config/config.yaml b/prow/config/config.yaml
index 57fcc065..062783ed 100644
--- a/prow/config/config.yaml
+++ b/prow/config/config.yaml
@@ -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"
@@ -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"