From bc6ae7efe63395e668d5025ca0d4c4f382d7f719 Mon Sep 17 00:00:00 2001
From: Ivan Valdes <ivan@vald.es>
Date: Wed, 4 Sep 2024 21:37:31 -0700
Subject: [PATCH] etcd: remove performance ratio periodic jobs

recover azure cloud provider jobs

Update release-master.yaml

update azure dashboard names

Update config.yaml
---
 config/jobs/etcd/etcd-periodics.yaml          | 180 -----------
 .../azure/release-master.yaml                 | 290 ++++++++++++++++++
 .../sig-cloud-provider/azure/config.yaml      |   3 +-
 3 files changed, 292 insertions(+), 181 deletions(-)
 create mode 100644 config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml

diff --git a/config/jobs/etcd/etcd-periodics.yaml b/config/jobs/etcd/etcd-periodics.yaml
index 6ceff33fb192..28b87e9c250c 100644
--- a/config/jobs/etcd/etcd-periodics.yaml
+++ b/config/jobs/etcd/etcd-periodics.yaml
@@ -463,183 +463,3 @@ periodics:
         privileged: true
     nodeSelector:
       kubernetes.io/arch: arm64
-
-- name: ci-etcd-performance-ratio-1-128-amd64
-  interval: 24h
-  cluster: eks-prow-build-cluster
-  decorate: true
-  decoration_config:
-    timeout: 4h
-  extra_refs:
-    - org: etcd-io
-      repo: etcd
-      base_ref: main
-  annotations:
-    testgrid-dashboards: sig-etcd-periodics
-    testgrid-tab-name: ci-etcd-performance-ratio-1-128-amd64
-  spec:
-    containers:
-    - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master
-      command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        set -euo pipefail
-        make build tools
-        RATIO_LIST=1/128 ./tools/rw-heatmaps/rw-benchmark.sh
-        cp result-*.csv "${ARTIFACTS}/result-$(git rev-parse HEAD).csv"
-      resources:
-        requests:
-          cpu: "7"
-          memory: "4Gi"
-        limits:
-          cpu: "7"
-          memory: "4Gi"
-    nodeSelector:
-      kubernetes.io/arch: amd64
-
-- name: ci-etcd-performance-ratio-1-8-amd64
-  interval: 24h
-  cluster: eks-prow-build-cluster
-  decorate: true
-  decoration_config:
-    timeout: 10h
-  extra_refs:
-    - org: etcd-io
-      repo: etcd
-      base_ref: main
-  annotations:
-    testgrid-dashboards: sig-etcd-periodics
-    testgrid-tab-name: ci-etcd-performance-ratio-1-8-amd64
-  spec:
-    containers:
-    - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master
-      command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        set -euo pipefail
-        make build tools
-        RATIO_LIST=1/8 ./tools/rw-heatmaps/rw-benchmark.sh
-        cp result-*.csv "${ARTIFACTS}/result-$(git rev-parse HEAD).csv"
-      resources:
-        requests:
-          cpu: "7"
-          memory: "8Gi"
-        limits:
-          cpu: "7"
-          memory: "8Gi"
-    nodeSelector:
-      kubernetes.io/arch: amd64
-
-- name: ci-etcd-performance-ratio-1-4-amd64
-  interval: 24h
-  cluster: eks-prow-build-cluster
-  decorate: true
-  decoration_config:
-    timeout: 14h
-  extra_refs:
-    - org: etcd-io
-      repo: etcd
-      base_ref: main
-  annotations:
-    testgrid-dashboards: sig-etcd-periodics
-    testgrid-tab-name: ci-etcd-performance-ratio-1-4-amd64
-  spec:
-    containers:
-    - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master
-      command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        set -euo pipefail
-        make build tools
-        RATIO_LIST=1/4 ./tools/rw-heatmaps/rw-benchmark.sh
-        cp result-*.csv "${ARTIFACTS}/result-$(git rev-parse HEAD).csv"
-      resources:
-        requests:
-          cpu: "7"
-          memory: "8Gi"
-        limits:
-          cpu: "7"
-          memory: "8Gi"
-    nodeSelector:
-      kubernetes.io/arch: amd64
-
-- name: ci-etcd-performance-ratio-1-2-amd64
-  interval: 24h
-  cluster: eks-prow-build-cluster
-  decorate: true
-  decoration_config:
-    timeout: 16h
-  extra_refs:
-    - org: etcd-io
-      repo: etcd
-      base_ref: main
-  annotations:
-    testgrid-dashboards: sig-etcd-periodics
-    testgrid-tab-name: ci-etcd-performance-ratio-1-2-amd64
-  spec:
-    containers:
-    - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master
-      command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        set -euo pipefail
-        make build tools
-        RATIO_LIST=1/2 ./tools/rw-heatmaps/rw-benchmark.sh
-        cp result-*.csv "${ARTIFACTS}/result-$(git rev-parse HEAD).csv"
-      resources:
-        requests:
-          cpu: "7"
-          memory: "10Gi"
-        limits:
-          cpu: "7"
-          memory: "10Gi"
-    nodeSelector:
-      kubernetes.io/arch: amd64
-
-- name: ci-etcd-performance-ratio-2-1-amd64
-  interval: 24h
-  cluster: eks-prow-build-cluster
-  decorate: true
-  decoration_config:
-    timeout: 16h
-  extra_refs:
-    - org: etcd-io
-      repo: etcd
-      base_ref: main
-  annotations:
-    testgrid-dashboards: sig-etcd-periodics
-    testgrid-tab-name: ci-etcd-performance-ratio-2-1-amd64
-  spec:
-    containers:
-    - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master
-      command:
-      - runner.sh
-      args:
-      - bash
-      - -c
-      - |
-        set -euo pipefail
-        make build tools
-        RATIO_LIST=2/1 ./tools/rw-heatmaps/rw-benchmark.sh
-        cp result-*.csv "${ARTIFACTS}/result-$(git rev-parse HEAD).csv"
-      resources:
-        requests:
-          cpu: "7"
-          memory: "10Gi"
-        limits:
-          cpu: "7"
-          memory: "10Gi"
-    nodeSelector:
-      kubernetes.io/arch: amd64
diff --git a/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml b/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml
new file mode 100644
index 000000000000..7b5d3c5315dd
--- /dev/null
+++ b/config/jobs/kubernetes/sig-cloud-provider/azure/release-master.yaml
@@ -0,0 +1,290 @@
+presubmits:
+  kubernetes/kubernetes:
+  - name: pull-kubernetes-e2e-capz-azure-disk
+    cluster: eks-prow-build-cluster
+    decorate: true
+    always_run: false
+    optional: true
+    run_if_changed: 'azure.*\.go'
+    path_alias: k8s.io/kubernetes
+    branches:
+      - master # TODO(releng): Remove once repo default branch has been renamed
+      - main
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+      preset-azure-community: "true"
+    extra_refs:
+      - org: kubernetes-sigs
+        repo: cluster-api-provider-azure
+        base_ref: release-1.16
+        path_alias: sigs.k8s.io/cluster-api-provider-azure
+        workdir: true
+      - org: kubernetes-sigs
+        repo: azuredisk-csi-driver
+        base_ref: master
+        path_alias: sigs.k8s.io/azuredisk-csi-driver
+      - org: kubernetes-sigs
+        repo: cloud-provider-azure
+        base_ref: master
+        path_alias: sigs.k8s.io/cloud-provider-azure
+    spec:
+      serviceAccountName: azure
+      containers:
+        - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
+          command:
+            - runner.sh
+            - ./scripts/ci-entrypoint.sh
+          args:
+            - bash
+            - -c
+            - >-
+              cd ${GOPATH}/src/sigs.k8s.io/azuredisk-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset &&
+              make e2e-test
+          env:
+            - name: AZURE_STORAGE_DRIVER # azuredisk-csi-driver config
+              value: "kubernetes.io/azure-disk" # In-tree Azure disk storage class
+          securityContext:
+            privileged: true
+          resources:
+            limits:
+              cpu: 4
+              memory: 8Gi
+            requests:
+              cpu: 4
+              memory: 8Gi
+    annotations:
+      testgrid-dashboards: provider-azure-presubmit
+      testgrid-tab-name: pull-kubernetes-e2e-capz-azure-disk
+      testgrid-alert-email: kubernetes-provider-azure@googlegroups.com
+      testgrid-num-columns-recent: '30'
+  - name: pull-kubernetes-e2e-capz-azure-disk-vmss
+    cluster: eks-prow-build-cluster
+    decorate: true
+    always_run: false
+    optional: true
+    run_if_changed: 'azure.*\.go'
+    path_alias: k8s.io/kubernetes
+    branches:
+      - master # TODO(releng): Remove once repo default branch has been renamed
+      - main
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+      preset-azure-community: "true"
+    extra_refs:
+      - org: kubernetes-sigs
+        repo: cluster-api-provider-azure
+        base_ref: release-1.16
+        path_alias: sigs.k8s.io/cluster-api-provider-azure
+        workdir: true
+      - org: kubernetes-sigs
+        repo: azuredisk-csi-driver
+        base_ref: master
+        path_alias: sigs.k8s.io/azuredisk-csi-driver
+      - org: kubernetes-sigs
+        repo: cloud-provider-azure
+        base_ref: master
+        path_alias: sigs.k8s.io/cloud-provider-azure
+    spec:
+      serviceAccountName: azure
+      containers:
+        - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
+          command:
+            - runner.sh
+            - ./scripts/ci-entrypoint.sh
+          args:
+            - bash
+            - -c
+            - >-
+              cd ${GOPATH}/src/sigs.k8s.io/azuredisk-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset &&
+              make e2e-test
+          env:
+            - name: AZURE_STORAGE_DRIVER # azuredisk-csi-driver config
+              value: "kubernetes.io/azure-disk" # In-tree Azure disk storage class
+            - name: EXP_MACHINE_POOL # CAPZ config
+              value: "true"
+          securityContext:
+            privileged: true
+          resources:
+            limits:
+              cpu: 4
+              memory: 8Gi
+            requests:
+              cpu: 4
+              memory: 8Gi
+    annotations:
+      testgrid-dashboards: provider-azure-presubmit
+      testgrid-tab-name: pull-kubernetes-e2e-capz-azure-disk-vmss
+      testgrid-alert-email: kubernetes-provider-azure@googlegroups.com
+      testgrid-num-columns-recent: '30'
+  - name: pull-kubernetes-e2e-capz-azure-file
+    cluster: eks-prow-build-cluster
+    decorate: true
+    always_run: false
+    optional: true
+    run_if_changed: 'azure.*\.go'
+    path_alias: k8s.io/kubernetes
+    branches:
+      - master # TODO(releng): Remove once repo default branch has been renamed
+      - main
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+      preset-azure-community: "true"
+    extra_refs:
+      - org: kubernetes-sigs
+        repo: cluster-api-provider-azure
+        base_ref: release-1.16
+        path_alias: sigs.k8s.io/cluster-api-provider-azure
+        workdir: true
+      - org: kubernetes-sigs
+        repo: azurefile-csi-driver
+        base_ref: master
+        path_alias: sigs.k8s.io/azurefile-csi-driver
+      - org: kubernetes-sigs
+        repo: cloud-provider-azure
+        base_ref: master
+        path_alias: sigs.k8s.io/cloud-provider-azure
+    spec:
+      serviceAccountName: azure
+      containers:
+        - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
+          command:
+            - runner.sh
+            - ./scripts/ci-entrypoint.sh
+          args:
+            - bash
+            - -c
+            - >-
+              kubectl apply -f templates/addons/azurefile-role.yaml &&
+              cd ${GOPATH}/src/sigs.k8s.io/azurefile-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset &&
+              make e2e-test
+          env:
+            - name: AZURE_STORAGE_DRIVER # azuredisk-csi-driver config
+              value: "kubernetes.io/azure-file" # In-tree Azure file storage class
+          securityContext:
+            privileged: true
+          resources:
+            limits:
+              cpu: 4
+              memory: 8Gi
+            requests:
+              cpu: 4
+              memory: 8Gi
+    annotations:
+      testgrid-dashboards: provider-azure-presubmit
+      testgrid-tab-name: pull-kubernetes-e2e-capz-azure-file
+      testgrid-alert-email: kubernetes-provider-azure@googlegroups.com
+      testgrid-num-columns-recent: '30'
+  - name: pull-kubernetes-e2e-capz-azure-file-vmss
+    cluster: eks-prow-build-cluster
+    decorate: true
+    always_run: false
+    optional: true
+    run_if_changed: 'azure.*\.go'
+    path_alias: k8s.io/kubernetes
+    branches:
+      - master # TODO(releng): Remove once repo default branch has been renamed
+      - main
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+      preset-azure-community: "true"
+    extra_refs:
+      - org: kubernetes-sigs
+        repo: cluster-api-provider-azure
+        base_ref: release-1.16
+        path_alias: sigs.k8s.io/cluster-api-provider-azure
+        workdir: true
+      - org: kubernetes-sigs
+        repo: azurefile-csi-driver
+        base_ref: master
+        path_alias: sigs.k8s.io/azurefile-csi-driver
+      - org: kubernetes-sigs
+        repo: cloud-provider-azure
+        base_ref: master
+        path_alias: sigs.k8s.io/cloud-provider-azure
+    spec:
+      serviceAccountName: azure
+      containers:
+        - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
+          command:
+            - runner.sh
+            - ./scripts/ci-entrypoint.sh
+          args:
+            - bash
+            - -c
+            - >-
+              kubectl apply -f templates/addons/azurefile-role.yaml &&
+              cd ${GOPATH}/src/sigs.k8s.io/azurefile-csi-driver && ./deploy/install-driver.sh master local,snapshot,enable-avset &&
+              make e2e-test
+          env:
+            - name: AZURE_STORAGE_DRIVER # azuredisk-csi-driver config
+              value: "kubernetes.io/azure-file" # In-tree Azure file storage class
+            - name: EXP_MACHINE_POOL # CAPZ config
+              value: "true"
+          securityContext:
+            privileged: true
+          resources:
+            limits:
+              cpu: 4
+              memory: 8Gi
+            requests:
+              cpu: 4
+              memory: 8Gi
+    annotations:
+      testgrid-dashboards: provider-azure-presubmit
+      testgrid-tab-name: pull-kubernetes-e2e-capz-azure-file-vmss
+      testgrid-alert-email: kubernetes-provider-azure@googlegroups.com
+      testgrid-num-columns-recent: '30'
+  - name: pull-kubernetes-e2e-capz-conformance
+    cluster: eks-prow-build-cluster
+    decorate: true
+    always_run: false
+    optional: true
+    run_if_changed: 'azure.*\.go'
+    path_alias: k8s.io/kubernetes
+    branches:
+      - master # TODO(releng): Remove once repo default branch has been renamed
+      - main
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
+      preset-azure-community: "true"
+    extra_refs:
+    - org: kubernetes-sigs
+      repo: cluster-api-provider-azure
+      base_ref: release-1.16
+      path_alias: sigs.k8s.io/cluster-api-provider-azure
+      workdir: true
+    - org: kubernetes-sigs
+      repo: cloud-provider-azure
+      base_ref: master
+      path_alias: sigs.k8s.io/cloud-provider-azure
+    spec:
+      serviceAccountName: azure
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
+        command:
+        - runner.sh
+        - ./scripts/ci-conformance.sh
+        securityContext:
+          privileged: true
+        resources:
+          limits:
+            cpu: 4
+            memory: 8Gi
+          requests:
+            cpu: 4
+            memory: 8Gi
+        env:
+        - name: KUBETEST_CONF_PATH
+          value: /home/prow/go/src/sigs.k8s.io/cluster-api-provider-azure/test/e2e/data/kubetest/conformance-fast.yaml
+        - name: CONFORMANCE_NODES
+          value: "25"
+    annotations:
+      testgrid-dashboards: provider-azure-presubmit
+      testgrid-tab-name: pull-kubernetes-e2e-capz-conformance
+      testgrid-alert-email: kubernetes-provider-azure@googlegroups.com
+      testgrid-num-columns-recent: '30'
diff --git a/config/testgrids/kubernetes/sig-cloud-provider/azure/config.yaml b/config/testgrids/kubernetes/sig-cloud-provider/azure/config.yaml
index 76cff4f37214..295025b44236 100644
--- a/config/testgrids/kubernetes/sig-cloud-provider/azure/config.yaml
+++ b/config/testgrids/kubernetes/sig-cloud-provider/azure/config.yaml
@@ -9,6 +9,7 @@ dashboard_groups:
       - provider-azure-cloud-provider-azure-1-29
       - provider-azure-cloud-provider-azure-1-30
       - provider-azure-cloud-provider-azure-1-31
+      - provider-azure-presubmit
 
 dashboards:
   - name: provider-azure-azuredisk-csi-driver
@@ -19,4 +20,4 @@ dashboards:
   - name: provider-azure-cloud-provider-azure-1-29
   - name: provider-azure-cloud-provider-azure-1-30
   - name: provider-azure-cloud-provider-azure-1-31
-
+  - name: provider-azure-presubmit