Refactor Terraform scripts for different providers

Signed-off-by: Victor Morales <v.morales@samsung.com>
nephio-project · Aug 29, 2023 · 7fcf5f7 · 7fcf5f7
1 parent 9516c24
commit 7fcf5f7
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 99 deletions.
diff --git a/.prow.yaml b/.prow.yaml
@@ -14,7 +14,7 @@ presubmits:
           args:
             - "--plugin-config=prow/config/plugins.yaml"
             - "--config-path=prow/config/config.yaml"
-  - name: e2e-ubuntu
+  - name: e2e-ubuntu-focal
     annotations:
     labels:
     run_if_changed: '^e2e/'
@@ -29,8 +29,8 @@ presubmits:
           args:
             - "-c"
             - |
-              set -eE; cd e2e/terraform/ubuntu; trap 'terraform destroy -auto-approve' EXIT;
-              terraform init && timeout 75m terraform apply -auto-approve
+              set -eE; cd e2e/terraform; trap 'terraform destroy -target module.gcp-ubuntu-focal -auto-approve' EXIT;
+              terraform init && timeout 75m terraform apply -target module.gcp-ubuntu-focal -auto-approve
           volumeMounts:
             - name: satoken
               mountPath: "/etc/satoken"
@@ -64,7 +64,7 @@ presubmits:
             items:
               - key: nephio.yaml
                 path: nephio.yaml
-  - name: e2e-fedora
+  - name: e2e-fedora-34
     annotations:
     labels:
     run_if_changed: '^e2e/'
@@ -79,8 +79,8 @@ presubmits:
           args:
             - "-c"
             - |
-              set -eE; cd e2e/terraform/fedora; trap 'terraform destroy -auto-approve' EXIT;
-              terraform init && timeout 75m terraform apply -auto-approve
+              set -eE; cd e2e/terraform; trap 'terraform destroy -target module.gcp-fedora-34 -auto-approve' EXIT;
+              terraform init && timeout 75m terraform apply -target module.gcp-fedora-34 -auto-approve
           volumeMounts:
             - name: satoken
               mountPath: "/etc/satoken"
@@ -298,7 +298,7 @@ postsubmits:
                 path: config.json
 
 periodics:
-  - name: e2e-daily
+  - name: e2e-ubuntu-focal-daily
     annotations:
     labels:
     cron: "0 15 * * 1-5"
@@ -313,8 +313,58 @@ periodics:
           args:
             - "-c"
             - |
-              set -eE; cd e2e/terraform; trap 'terraform destroy -auto-approve' EXIT;
-              terraform init && timeout 75m terraform apply -auto-approve
+              set -eE; cd e2e/terraform; trap 'terraform destroy -target module.gcp-ubuntu-focal -auto-approve' EXIT;
+              terraform init && timeout 75m terraform apply -target module.gcp-ubuntu-focal -auto-approve
+          volumeMounts:
+            - name: satoken
+              mountPath: "/etc/satoken"
+            - name: ssh-key-vol
+              mountPath: "/etc/ssh-key"
+            - name: nephio-e2e-yaml
+              mountPath: "/etc/nephio"
+          resources:
+            requests:
+              cpu: 2
+              memory: 2Gi
+      volumes:
+        - name: satoken
+          secret:
+            secretName: satoken
+            items:
+              - key: satoken
+                path: satoken
+        - name: ssh-key-vol
+          secret:
+            secretName: ssh-key-e2e
+            defaultMode: 256
+            items:
+              - key: id_rsa
+                path: id_rsa
+              - key: id_rsa.pub
+                path: id_rsa.pub
+        - name: nephio-e2e-yaml
+          secret:
+            secretName: nephio-e2e-yaml
+            items:
+              - key: nephio.yaml
+                path: nephio.yaml
+  - name: e2e-fedora-34-daily
+    annotations:
+    labels:
+    cron: "0 15 * * 1-5"
+    skip_report: false
+    decorate: true
+    cluster: default
+    spec:
+      containers:
+        - image: "nephio/e2e:1"
+          command:
+            - "/bin/sh"
+          args:
+            - "-c"
+            - |
+              set -eE; cd e2e/terraform; trap 'terraform destroy -target module.gcp-fedora-34 -auto-approve' EXIT;
+              terraform init && timeout 75m terraform apply -target module.gcp-fedora-34 -auto-approve
           volumeMounts:
             - name: satoken
               mountPath: "/etc/satoken"

diff --git a/e2e/terraform/fedora/main.tf b/e2e/terraform/fedora/main.tf
diff --git a/e2e/terraform/main.tf b/e2e/terraform/main.tf
@@ -0,0 +1,10 @@
+module "gcp-ubuntu-focal" {
+  source  = ".//modules/gcp"
+  vmimage = "ubuntu-os-cloud/ubuntu-2004-lts"
+}
+
+module "gcp-fedora-34" {
+  source       = ".//modules/gcp"
+  vmimage      = "fedora-cloud/fedora-cloud-34"
+  ansible_user = "fedora"
+}
diff --git a/e2e/terraform/modules/e2e/variables.tf b/e2e/terraform/modules/e2e/variables.tf
diff --git a/e2e/terraform/modules/e2e/main.tf → e2e/terraform/modules/gcp/main.tf b/e2e/terraform/modules/e2e/main.tf → e2e/terraform/modules/gcp/main.tf
@@ -1,3 +1,10 @@
+provider "google" {
+  credentials = file(var.credentials)
+  project     = var.project
+  region      = var.region
+  zone        = var.zone
+}
+
 resource "random_string" "vm-name" {
   length  = 6
   upper   = false
@@ -7,8 +14,8 @@ resource "random_string" "vm-name" {
 }
 
 locals {
-  vm-name = "e2e-vm-${random_string.vm-name.result}"
-  nephioyaml = "/home/${var.home_user}/nephio.yaml"
+  vm-name    = "e2e-vm-${random_string.vm-name.result}"
+  nephioyaml = "/home/${var.ansible_user}/nephio.yaml"
 }
 
 resource "google_compute_instance" "lab_instances" {
@@ -55,7 +62,7 @@ resource "google_compute_instance" "e2e_instances" {
   }
   provisioner "file" {
     source      = "../../../../test-infra"
-    destination = "/home/${var.home_user}/test-infra"
+    destination = "/home/${var.ansible_user}/test-infra"
     connection {
       host        = self.network_interface[0].access_config[0].nat_ip
       type        = "ssh"
@@ -88,17 +95,17 @@ resource "google_compute_instance" "e2e_instances" {
     ]
   }
   provisioner "remote-exec" {
-      connection {
-        host        = self.network_interface[0].access_config[0].nat_ip
-        type        = "ssh"
-        private_key = file(var.ssh_prv_key)
-        user        = var.ansible_user
-        agent       = false
-      }
-      inline = [
-        "cd /home/${var.home_user}/test-infra/e2e/provision/",
-        "chmod +x init.sh",
-        "sudo -E NEPHIO_REPO_DIR=/home/${var.home_user}/test-infra NEPHIO_DEBUG=true NEPHIO_RUN_E2E=true NEPHIO_USER=${var.home_user} ./init.sh"
-      ]
+    connection {
+      host        = self.network_interface[0].access_config[0].nat_ip
+      type        = "ssh"
+      private_key = file(var.ssh_prv_key)
+      user        = var.ansible_user
+      agent       = false
     }
+    inline = [
+      "cd /home/${var.ansible_user}/test-infra/e2e/provision/",
+      "chmod +x init.sh",
+      "sudo -E NEPHIO_REPO_DIR=/home/${var.ansible_user}/test-infra NEPHIO_DEBUG=true NEPHIO_RUN_E2E=true NEPHIO_USER=${var.ansible_user} ./init.sh"
+    ]
+  }
 }
diff --git a/e2e/terraform/modules/e2e/output.tf → e2e/terraform/modules/gcp/output.tf b/e2e/terraform/modules/e2e/output.tf → e2e/terraform/modules/gcp/output.tf
diff --git a/e2e/terraform/modules/gcp/variables.tf b/e2e/terraform/modules/gcp/variables.tf
@@ -0,0 +1,65 @@
+variable "project" {
+  description = "GCP project that will host CI instances"
+  default     = "pure-faculty-367518"
+  type        = string
+}
+
+variable "region" {
+  description = "GCP region to deploy CI instances"
+  default     = "us-central1"
+  type        = string
+}
+
+variable "zone" {
+  description = "GCP zone to deploy CI instances"
+  default     = "us-central1-c"
+  type        = string
+}
+
+variable "instance" {
+  description = "GCP flavor to be used by the CI instances"
+  default     = "e2-standard-16"
+  type        = string
+}
+
+variable "vmimage" {
+  description = "OS image to be used for the creation of CI instances"
+  default     = "ubuntu-os-cloud/ubuntu-2004-lts"
+  type        = string
+}
+
+variable "credentials" {
+  description = "Credentials file to connect to GCP"
+  default     = "/etc/satoken/satoken"
+  type        = string
+}
+
+variable "ssh_prv_key" {
+  description = "SSH private key for CI instance's connection"
+  default     = "/etc/ssh-key/id_rsa"
+  type        = string
+}
+
+variable "ssh_pub_key" {
+  description = "SSH public key for CI instance's connection"
+  default     = "/etc/ssh-key/id_rsa.pub"
+  type        = string
+}
+
+variable "ansible_user" {
+  description = "OS user used for Ansible connectivity"
+  default     = "ubuntu"
+  type        = string
+}
+
+variable "nephio_lab_nodes" {
+  description = "The number of Lab instances to be created."
+  default     = 0
+  type        = number
+}
+
+variable "nephio_e2e_nodes" {
+  description = "The number of End-to-End instances running per PR."
+  default     = 1
+  type        = number
+}
diff --git a/e2e/terraform/ubuntu/main.tf b/e2e/terraform/ubuntu/main.tf