From 876b39539624dad8a673179cb6c9d866dd60f8ee Mon Sep 17 00:00:00 2001 From: Fiachra Corcoran Date: Fri, 6 Dec 2024 11:40:19 +0000 Subject: [PATCH] Refine kubeadm CI frequency (#317) --- .prow.yaml | 4 +- prow/config/config.yaml | 96 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/.prow.yaml b/.prow.yaml index 313ce7a3..fe6c0a96 100644 --- a/.prow.yaml +++ b/.prow.yaml @@ -292,7 +292,7 @@ presubmits: - name: e2e-kubeadm-ubuntu-jammy annotations: labels: - run_if_changed: '^e2e/' + run_if_changed: '^e2e/provision/playbooks/roles/kubeadm' skip_report: false optional: true decorate: true @@ -335,7 +335,7 @@ presubmits: - name: e2e-kubeadm-fedora-38 annotations: labels: - run_if_changed: '^e2e/' + run_if_changed: '^e2e/provision/playbooks/roles/kubeadm' skip_report: false optional: true decorate: true diff --git a/prow/config/config.yaml b/prow/config/config.yaml index 72ab6f1e..44381470 100644 --- a/prow/config/config.yaml +++ b/prow/config/config.yaml @@ -1907,7 +1907,7 @@ periodics: path: id_rsa - key: id_rsa.pub path: id_rsa.pub - - name: e2e-daily-oai-fedora-34 + - name: e2e-daily-fedora-34-oai annotations: labels: cron: "0 15 * * 1-6" @@ -1954,3 +1954,97 @@ periodics: path: id_rsa - key: id_rsa.pub path: id_rsa.pub + - name: e2e-daily-ubuntu-jammy-kubeadm + annotations: + labels: + cron: "0 15 * * 1-6" + skip_report: false + decorate: true + cluster: default + extra_refs: + - org: nephio-project + repo: test-infra + base_ref: main + path_alias: nephio_repo/test-infra + spec: + containers: + - image: "nephio/e2e:latest" + command: + - "/bin/sh" + args: + - "-c" + - | + set -eE; cd "$(git rev-parse --show-toplevel)/e2e/terraform"; trap 'terraform destroy -target module.gcp-ubuntu-jammy -auto-approve' EXIT; + terraform init && timeout 120m terraform apply -target module.gcp-ubuntu-jammy -var="fail_fast=true" -var="mgmt_cluster_type=kubeadm" -auto-approve + volumeMounts: + - name: satoken + mountPath: "/etc/satoken" + - name: ssh-key-vol + mountPath: "/etc/ssh-key" + 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: e2e-daily-fedora-38-kubeadm + annotations: + labels: + cron: "0 15 * * 1-6" + skip_report: false + decorate: true + cluster: default + extra_refs: + - org: nephio-project + repo: test-infra + base_ref: main + path_alias: nephio_repo/test-infra + spec: + containers: + - image: "nephio/e2e:latest" + command: + - "/bin/sh" + args: + - "-c" + - | + 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="fail_fast=true" -var="mgmt_cluster_type=kubeadm" -auto-approve + volumeMounts: + - name: satoken + mountPath: "/etc/satoken" + - name: ssh-key-vol + mountPath: "/etc/ssh-key" + 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 \ No newline at end of file