From 43dd2ebba8e358a565ad9cd02c50908314a5ef00 Mon Sep 17 00:00:00 2001 From: Maciej Borsz Date: Wed, 19 Feb 2020 11:21:52 +0100 Subject: [PATCH] Revert "Add presubmits for perf-tests release branches" This reverts commit dfcf87cd4e292cbcdbdf6125ada555df82d4eb75. --- .../sig-release/release-branch-jobs/1.15.yaml | 105 --------------- .../sig-release/release-branch-jobs/1.16.yaml | 112 ---------------- .../sig-release/release-branch-jobs/1.17.yaml | 121 ----------------- .../sig-release/release-branch-jobs/1.18.yaml | 123 ------------------ .../sig-scalability-presubmit-jobs.yaml | 6 - 5 files changed, 467 deletions(-) diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.15.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.15.yaml index 4d667663cbf1..3c271bbc0128 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.15.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.15.yaml @@ -1018,108 +1018,3 @@ presubmits: image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.15 name: main resources: {} - kubernetes/perf-tests: - - always_run: false - branches: - - release-1.15 - labels: - preset-bazel-scratch-dir: "true" - preset-e2e-scalability-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2 - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.15 - - --gcp-nodes=100 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --provider=gce - - --tear-down-previous - - --test=false - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=gce - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/gce/throughput_override.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.15 - name: "" - resources: - requests: - memory: 6Gi - - always_run: false - branches: - - release-1.15 - labels: - preset-bazel-scratch-dir: "true" - preset-dind-enabled: "true" - preset-e2e-kubemark-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2-kubemark - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.15 - - --gcp-master-size=n1-standard-2 - - --gcp-node-size=n1-standard-4 - - --gcp-nodes=4 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --kubemark - - --kubemark-nodes=100 - - --provider=gce - - --tear-down-previous - - --test=false - - --test_args=--ginkgo.focus=xxxx - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=kubemark - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/kubemark/throughput_override.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.15 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.16.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.16.yaml index 316d31d7b36c..8931cbc0c8fb 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.16.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.16.yaml @@ -1024,115 +1024,3 @@ presubmits: image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.16 name: main resources: {} - kubernetes/perf-tests: - - always_run: false - branches: - - release-1.16 - labels: - preset-bazel-scratch-dir: "true" - preset-e2e-scalability-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2 - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.16 - - --gcp-nodes=100 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --provider=gce - - --tear-down-previous - - --test=false - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=gce - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/gce/throughput_override.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_configmaps.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_daemonsets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_jobs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_pvs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_secrets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_statefulsets.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.16 - name: "" - resources: - requests: - memory: 6Gi - - always_run: false - branches: - - release-1.16 - labels: - preset-bazel-scratch-dir: "true" - preset-dind-enabled: "true" - preset-e2e-kubemark-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2-kubemark - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.16 - - --gcp-master-size=n1-standard-2 - - --gcp-node-size=n1-standard-4 - - --gcp-nodes=4 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --kubemark - - --kubemark-nodes=100 - - --provider=gce - - --tear-down-previous - - --test=false - - --test_args=--ginkgo.focus=xxxx - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=kubemark - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/kubemark/throughput_override.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.16 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml index b776b5fa769c..09b2dff2b3cd 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.17.yaml @@ -1146,124 +1146,3 @@ presubmits: cpu: "4" securityContext: privileged: true - kubernetes/perf-tests: - - always_run: false - branches: - - release-1.17 - labels: - preset-bazel-scratch-dir: "true" - preset-e2e-scalability-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2 - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.17 - - --gcp-nodes=100 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --provider=gce - - --tear-down-previous - - --test=false - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=gce - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/gce/throughput_override.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_configmaps.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_daemonsets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_jobs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_pvs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_secrets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_statefulsets.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_restart_count_check.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.17 - name: "" - resources: - requests: - memory: 6Gi - - always_run: false - branches: - - release-1.17 - labels: - preset-bazel-scratch-dir: "true" - preset-dind-enabled: "true" - preset-e2e-kubemark-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2-kubemark - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.17 - - --gcp-master-size=n1-standard-2 - - --gcp-node-size=n1-standard-4 - - --gcp-nodes=4 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --kubemark - - --kubemark-nodes=100 - - --provider=gce - - --tear-down-previous - - --test=false - - --test_args=--ginkgo.focus=xxxx - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=kubemark - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/kubemark/throughput_override.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_configmaps.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_daemonsets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_jobs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_secrets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_statefulsets.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_restart_count_check.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200217-8ab6e0b-1.17 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.18.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.18.yaml index cb3cbaa5c655..aa4b691289d6 100644 --- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.18.yaml +++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.18.yaml @@ -1399,126 +1399,3 @@ presubmits: cpu: "4" securityContext: privileged: true - kubernetes/perf-tests: - - always_run: false - branches: - - release-1.18 - labels: - preset-bazel-scratch-dir: "true" - preset-e2e-scalability-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2 - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.18 - - --gcp-nodes=100 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --provider=gce - - --tear-down-previous - - --test=false - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=gce - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testconfig=testing/access-tokens/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/gce/throughput_override.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_configmaps.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_daemonsets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_jobs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_pvs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_secrets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_statefulsets.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_restart_count_check.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200219-0714eb5-1.18 - name: "" - resources: - requests: - memory: 6Gi - - always_run: false - branches: - - release-1.18 - labels: - preset-bazel-scratch-dir: "true" - preset-dind-enabled: "true" - preset-e2e-kubemark-common: "true" - preset-e2e-scalability-presubmits: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 3 - name: pull-perf-tests-clusterloader2-kubemark - run_if_changed: ^clusterloader2/.*$ - spec: - containers: - - args: - - --root=/go/src - - --repo=k8s.io/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-jenkins/pr-logs - - --timeout=120 - - --scenario=kubernetes_e2e - - -- - - --cluster= - - --extract=ci/latest-1.18 - - --gcp-master-size=n1-standard-2 - - --gcp-node-size=n1-standard-4 - - --gcp-nodes=4 - - --gcp-project-type=scalability-presubmit-project - - --gcp-zone=us-east1-b - - --kubemark - - --kubemark-nodes=100 - - --provider=gce - - --tear-down-previous - - --test=false - - --test_args=--ginkgo.focus=xxxx - - --test-cmd=$GOPATH/src/k8s.io/perf-tests/run-e2e.sh - - --test-cmd-args=cluster-loader2 - - --test-cmd-args=--nodes=100 - - --test-cmd-args=--prometheus-scrape-node-exporter - - --test-cmd-args=--provider=kubemark - - --test-cmd-args=--report-dir=/workspace/_artifacts - - --test-cmd-args=--testconfig=testing/density/config.yaml - - --test-cmd-args=--testconfig=testing/load/config.yaml - - --test-cmd-args=--testconfig=testing/access-tokens/config.yaml - - --test-cmd-args=--testoverrides=./testing/load/kubemark/throughput_override.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_configmaps.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_daemonsets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_jobs.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_secrets.yaml - - --test-cmd-args=--testoverrides=./testing/load/experimental/overrides/enable_statefulsets.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_prometheus_api_responsiveness.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/enable_restart_count_check.yaml - - --test-cmd-args=--testoverrides=./testing/experiments/use_simple_latency_query.yaml - - --test-cmd-name=ClusterLoaderV2 - - --timeout=100m - - --use-logexporter - image: gcr.io/k8s-testimages/kubekins-e2e:v20200219-0714eb5-1.18 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true diff --git a/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml b/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml index f576918b60a4..150b6d4a1a97 100644 --- a/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml +++ b/config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml @@ -314,9 +314,6 @@ presubmits: preset-bazel-scratch-dir: "true" preset-e2e-scalability-common: "true" preset-e2e-scalability-presubmits: "true" - annotations: - fork-per-release: "true" - fork-per-release-replacements: "extract=ci/latest -> extract=ci/latest-{{.Version}}" run_if_changed: ^clusterloader2/.*$ spec: containers: @@ -376,9 +373,6 @@ presubmits: preset-dind-enabled: "true" preset-e2e-kubemark-common: "true" preset-e2e-scalability-presubmits: "true" - annotations: - fork-per-release: "true" - fork-per-release-replacements: "extract=ci/latest -> extract=ci/latest-{{.Version}}" run_if_changed: ^clusterloader2/.*$ spec: containers: