diff --git a/config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-config.yaml b/config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-config.yaml index 7e4f0609ab73..56afcc1afc65 100644 --- a/config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-config.yaml +++ b/config/jobs/kubernetes/sig-instrumentation/sig-instrumentation-config.yaml @@ -1,77 +1,4 @@ periodics: -- interval: 30m - name: ci-kubernetes-e2e-gce-influxdb - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - args: - - --timeout=70 - - --bare - - --scenario=kubernetes_e2e - - -- - - --check-leaked-resources - - --env=KUBE_ENABLE_CLUSTER_MONITORING=influxdb - - --extract=ci/latest - - --gcp-zone=us-west1-b - - --provider=gce - - --test_args=--ginkgo.focus=\[Feature:InfluxdbMonitoring\] - - --timeout=50m - image: gcr.io/k8s-testimages/kubekins-e2e:v20200107-164c5e8-master - - annotations: - testgrid-dashboards: google-gce - testgrid-tab-name: gce-influxdb -- interval: 30m - name: ci-kubernetes-e2e-gce-prometheus - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - args: - - --timeout=70 - - --bare - - --scenario=kubernetes_e2e - - -- - - --env=KUBE_ENABLE_PROMETHEUS_MONITORING=true - - --extract=ci/latest - - --gcp-zone=us-west1-b - - --provider=gce - - --test_args=--ginkgo.focus=\[Feature:PrometheusMonitoring\] --minStartupPods=8 - - --timeout=50m - image: gcr.io/k8s-testimages/kubekins-e2e:v20200107-164c5e8-master - - annotations: - testgrid-dashboards: google-gce - testgrid-tab-name: gce-prometheus -- interval: 30m - name: ci-kubernetes-e2e-gce-stackdriver - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - args: - - --timeout=70 - - --bare - - --scenario=kubernetes_e2e - - -- - - --check-leaked-resources - - --env=KUBE_ENABLE_CLUSTER_MONITORING=stackdriver - - --env=KUBE_ENABLE_METADATA_AGENT=stackdriver - - --extract=ci/latest - - --gcp-project=k8s-jkns-e2e-gce-stackdriver - - --gcp-zone=us-west1-b - - --provider=gce - - --test_args=--ginkgo.focus=\[Feature:StackdriverMonitoring\]|\[Feature:StackdriverCustomMetrics\]|\[Feature:StackdriverMetadataAgent\]|\[Feature:StackdriverExternalMetrics\] --minStartupPods=8 - - --timeout=50m - image: gcr.io/k8s-testimages/kubekins-e2e:v20200107-164c5e8-master - - annotations: - testgrid-dashboards: google-gce - testgrid-tab-name: gce-stackdriver - interval: 30m name: ci-kubernetes-e2e-gci-gce-es-logging labels: diff --git a/config/testgrids/kubernetes/sig-instrumentation/config.yaml b/config/testgrids/kubernetes/sig-instrumentation/config.yaml index 56050601d74e..8f95942d34a2 100644 --- a/config/testgrids/kubernetes/sig-instrumentation/config.yaml +++ b/config/testgrids/kubernetes/sig-instrumentation/config.yaml @@ -41,14 +41,6 @@ dashboards: test_group_name: ci-kubernetes-e2e-gci-gce-sd-logging base_options: include-filter-by-regex=sig-instrumentation description: sig-instrumentation gce stackdriver logging e2e tests for master branch - - name: gce-stackdriver - test_group_name: ci-kubernetes-e2e-gce-stackdriver - base_options: include-filter-by-regex=sig-instrumentation - description: sig-instrumentation gce stackdriver monitoring e2e tests for master branch - - name: gke-stackdriver - test_group_name: ci-kubernetes-e2e-gke-stackdriver - base_options: include-filter-by-regex=sig-instrumentation - description: sig-instrumentation gke stackdriver monitoring e2e tests for master branch - name: gke-sd-logging-gci-latest test_group_name: ci-kubernetes-e2e-gke-sd-logging-gci-latest base_options: include-filter-by-regex=sig-instrumentation @@ -73,11 +65,3 @@ dashboards: test_group_name: ci-kubernetes-e2e-gke-sd-logging-ubuntu-stable1 base_options: include-filter-by-regex=sig-instrumentation description: sig-instrumentation gke stackdriver logging e2e tests for 1.13 branch with Ubuntu - - name: gce-prometheus - test_group_name: ci-kubernetes-e2e-gce-prometheus - base_options: include-filter-by-regex=sig-instrumentation - description: sig-instrumentation gce prometheus monitoring e2e tests for master branch - - name: gce-influxdb - test_group_name: ci-kubernetes-e2e-gce-influxdb - base_options: include-filter-by-regex=sig-instrumentation - description: sig-instrumentation gce influxdb monitoring e2e tests for master branch