diff --git a/.prow.yaml b/.prow.yaml index 41e5d203..da7cece9 100644 --- a/.prow.yaml +++ b/.prow.yaml @@ -17,15 +17,10 @@ presubmits: - name: e2e annotations: labels: - run_if_changed: 'E2E_instance.txt' + run_if_changed: '^e2e/' skip_report: false decorate: true cluster: default - extra_refs: - - org: nephio-project - repo: one-summit-22-workshop - path_alias: github.com/nephio-project/one-summit-22-workshop - base_ref: main spec: containers: - image: "nephio/e2e:1" @@ -35,7 +30,7 @@ presubmits: - "-c" - | cd e2e/terraform && terraform init && terraform plan && \ - terraform apply -auto-approve && terraform destroy -auto-approve + terraform apply -auto-approve; terraform destroy -auto-approve volumeMounts: - name: satoken mountPath: "/etc/satoken" diff --git a/e2e/terraform/main.tf b/e2e/terraform/main.tf index 01c1a8e2..3de0157f 100644 --- a/e2e/terraform/main.tf +++ b/e2e/terraform/main.tf @@ -59,8 +59,9 @@ resource "google_compute_instance" "vm_instance" { agent = false } inline = [ - "chmod +x provision/gce_run.sh", - "provision/gce_run.sh" + "cd provision/" + "chmod +x gce_run.sh", + "./gce_run.sh" ] }