Remove gce_* prefix (#97)

* Remove gce_ prefix from *.sh scripts Signed-off-by: Victor Morales <v.morales@samsung.com> * Fix e2e CI execution Signed-off-by: Victor Morales <v.morales@samsung.com> --------- Signed-off-by: Victor Morales <v.morales@samsung.com>
nephio-project · Jun 14, 2023 · 96e3c64 · 96e3c64
1 parent a6baf9c
commit 96e3c64
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.prow.yaml b/.prow.yaml
@@ -29,8 +29,8 @@ presubmits:
           args:
             - "-c"
             - |
-              cd e2e/terraform && terraform init && terraform plan && \
-              terraform apply -auto-approve; terraform destroy -auto-approve
+              set -eE; cd e2e/terraform; trap 'terraform destroy -auto-approve' EXIT;
+              terraform init && timeout 45m terraform apply -auto-approve
           volumeMounts:
             - name: satoken
               mountPath: "/etc/satoken"
@@ -225,8 +225,8 @@ periodics:
           args:
             - "-c"
             - |
-              cd e2e/terraform && terraform init && terraform plan && \
-              terraform apply -auto-approve; terraform destroy -auto-approve
+              set -eE; cd e2e/terraform; trap 'terraform destroy -auto-approve' EXIT;
+              terraform init && timeout 45m terraform apply -auto-approve
           volumeMounts:
             - name: satoken
               mountPath: "/etc/satoken"

diff --git a/e2e/launch.sh b/e2e/launch.sh
@@ -21,7 +21,7 @@ RUNE2E=${2:-false}
 REPO=${3:-nephio-project/test-infra}
 BRANCH=${4:-main}
 
-STARTUP_SCRIPT_URL="https://raw.githubusercontent.com/$REPO/$BRANCH/e2e/provision/gce_init.sh"
+STARTUP_SCRIPT_URL="https://raw.githubusercontent.com/$REPO/$BRANCH/e2e/provision/init.sh"
 FULLREPO="https://github.com/$REPO.git"
 
 gcloud compute instances delete -q "$VM" || echo

diff --git a/e2e/provision/README.md b/e2e/provision/README.md
@@ -27,7 +27,7 @@ gcloud compute instances create --machine-type e2-standard-8 \
                                     --boot-disk-size 200GB \
                                     --image-family=ubuntu-2004-lts \
                                     --image-project=ubuntu-os-cloud \
-                                    --metadata=startup-script-url=https://raw.githubusercontent.com/nephio-project/test-infra/main/e2e/provision/gce_init.sh \
+                                    --metadata=startup-script-url=https://raw.githubusercontent.com/nephio-project/test-infra/main/e2e/provision/init.sh \
                                     nephio-r1-e2e
 ```
 
@@ -43,7 +43,7 @@ comma-delimited key=value pairs in the `--metadata` flag).
 - `nephio-test-infra-repo` defaults to
     `https://github.com/nephio-project/test-infra.git` but you can set it to
     your repository when testing changes to these scripts, and your repo will
-    then be pulled by the `gce_init.sh` instead.
+    then be pulled by the `init.sh` instead.
 - `nephio-test-infra-branch` defaults to `main` but you can use it along with
     the repo value to choose a branch in the repo for testing.
 
@@ -600,7 +600,7 @@ Order or create a VM with the following specification:
 
 ## Step 2: Kick off the install
 ```
-wget -O - https://raw.githubusercontent.com/nephio-project/test-infra/main/e2e/provision/gce_init.sh |  \
+wget -O - https://raw.githubusercontent.com/nephio-project/test-infra/main/e2e/provision/init.sh |  \
 sudo NEPHIO_DEBUG=false   \
      NEPHIO_USER=ubuntu  \
      bash
diff --git a/e2e/provision/Vagrantfile b/e2e/provision/Vagrantfile
@@ -46,7 +46,7 @@ Vagrant.configure('2') do |config|
       echo "StrictHostKeyChecking no" >> ~/.ssh/config
       cd /vagrant/
       cp nephio.yaml ~/nephio.yaml
-      ./gce_install_sandbox.sh | tee ~/gce_install_sandbox.log
+      ./install_sandbox.sh | tee ~/install_sandbox.log
     SHELL
   end
 

diff --git a/e2e/provision/gce_init.sh → e2e/provision/init.sh b/e2e/provision/gce_init.sh → e2e/provision/init.sh
@@ -47,7 +47,7 @@ chown $NEPHIO_USER:$NEPHIO_USER /home/$NEPHIO_USER/.bash_aliases
 sed -e "s/vagrant/$NEPHIO_USER/" </home/$NEPHIO_USER/test-infra/e2e/provision/nephio.yaml >/home/$NEPHIO_USER/nephio.yaml
 cd ./test-infra/e2e/provision
 export DEBUG DEPLOYMENT_TYPE
-runuser -u $NEPHIO_USER ./gce_install_sandbox.sh
+runuser -u $NEPHIO_USER ./install_sandbox.sh
 
 # Grant Docker permissions to current user
 if ! getent group docker | grep -q "$NEPHIO_USER"; then

diff --git a/e2e/provision/gce_install_sandbox.sh → e2e/provision/install_sandbox.sh b/e2e/provision/gce_install_sandbox.sh → e2e/provision/install_sandbox.sh
diff --git a/e2e/terraform/main.tf b/e2e/terraform/main.tf
@@ -24,7 +24,7 @@ resource "google_compute_instance" "lab_instances" {
   allow_stopping_for_update = true
   metadata = {
     ssh-keys                = "${var.ansible_user}:${file(var.ssh_pub_key)}"
-    metadata_startup_script = file("${path.module}/../provision/gce_init.sh")
+    metadata_startup_script = file("${path.module}/../provision/init.sh")
     nephio-run-e2e          = false
   }
   boot_disk {
@@ -91,9 +91,8 @@ resource "google_compute_instance" "e2e_instances" {
     }
     inline = [
       "cd provision/",
-      "chmod +x gce_install_sandbox.sh",
-      "export DEBUG=true",
-      "timeout --preserve-status 30m ./gce_install_sandbox.sh"
+      "chmod +x install_sandbox.sh",
+      "DEBUG=true ./install_sandbox.sh"
     ]
   }
 }