Merge pull request #3801 from fejta/kops

Delete slow, serial kops jobs
kubernetes · Oct 25, 2017 · 1312497 · 1312497
2 parents c450acc + 4434331
commit 1312497
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 131 deletions.
diff --git a/jobs/config.json b/jobs/config.json
@@ -7472,22 +7472,6 @@
       "sig-aws"
     ]
   },
-  "ci-kubernetes-e2e-kops-aws-serial": {
-    "args": [
-      "--aws",
-      "--cluster=e2e-kops-aws-serial.test-aws.k8s.io",
-      "--env-file=jobs/platform/kops_aws.env",
-      "--env-file=jobs/env/ci-kubernetes-e2e-kops-aws-serial.env",
-      "--extract=ci/latest",
-      "--provider=aws",
-      "--test_args=--ginkgo.flakeAttempts=2 --ginkgo.focus=\\[Serial\\]|\\[Disruptive\\] --ginkgo.skip=\\[Flaky\\]|\\[Feature:.+\\]|\\[HPA\\]|Dashboard|Services.*functioning.*NodePort",
-      "--timeout=300m"
-    ],
-    "scenario": "kubernetes_e2e",
-    "sigOwners": [
-      "sig-aws"
-    ]
-  },
   "ci-kubernetes-e2e-kops-aws-sig-cli": {
     "args": [
       "--aws",
@@ -7504,23 +7488,6 @@
       "sig-cli"
     ]
   },
-  "ci-kubernetes-e2e-kops-aws-slow": {
-    "args": [
-      "--aws",
-      "--cluster=e2e-kops-aws-slow.test-aws.k8s.io",
-      "--env-file=jobs/platform/kops_aws.env",
-      "--env-file=jobs/env/ci-kubernetes-e2e-kops-aws-slow.env",
-      "--extract=ci/latest",
-      "--ginkgo-parallel",
-      "--provider=aws",
-      "--test_args=--ginkgo.flakeAttempts=2 --ginkgo.focus=\\[Slow\\] --ginkgo.skip=\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\]|\\[HPA\\]|Dashboard|Services.*functioning.*NodePort",
-      "--timeout=150m"
-    ],
-    "scenario": "kubernetes_e2e",
-    "sigOwners": [
-      "sig-aws"
-    ]
-  },
   "ci-kubernetes-e2e-kops-aws-stable1": {
     "args": [
       "--aws",

diff --git a/jobs/env/ci-kubernetes-e2e-kops-aws-serial.env b/jobs/env/ci-kubernetes-e2e-kops-aws-serial.env
diff --git a/jobs/env/ci-kubernetes-e2e-kops-aws-slow.env b/jobs/env/ci-kubernetes-e2e-kops-aws-slow.env
diff --git a/prow/config.yaml b/prow/config.yaml
@@ -15494,49 +15494,6 @@ periodics:
         defaultMode: 256
         secretName: aws-cred
 
-- interval: 1h
-  agent: kubernetes
-  name: ci-kubernetes-e2e-kops-aws-serial
-  spec:
-    containers:
-    - args:
-      - --timeout=320
-      - --bare
-      env:
-      - name: GOOGLE_APPLICATION_CREDENTIALS
-        value: /etc/service-account/service-account.json
-      - name: USER
-        value: prow
-      - name: JENKINS_AWS_CREDENTIALS_FILE
-        value: /etc/aws-cred/credentials
-      - name: JENKINS_AWS_SSH_PRIVATE_KEY_FILE
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: JENKINS_AWS_SSH_PUBLIC_KEY_FILE
-        value: /etc/aws-ssh/aws-ssh-public
-      image: gcr.io/k8s-testimages/kubekins-e2e:v20171023-364289b6-master
-      volumeMounts:
-      - mountPath: /etc/service-account
-        name: service
-        readOnly: true
-      - mountPath: /etc/aws-ssh
-        name: aws-ssh
-        readOnly: true
-      - mountPath: /etc/aws-cred
-        name: aws-cred
-        readOnly: true
-    volumes:
-    - name: service
-      secret:
-        secretName: service-account
-    - name: aws-ssh
-      secret:
-        defaultMode: 256
-        secretName: aws-ssh-key-secret
-    - name: aws-cred
-      secret:
-        defaultMode: 256
-        secretName: aws-cred
-
 - interval: 2h
   agent: kubernetes
   name: ci-kubernetes-e2e-kops-aws-sig-cli
@@ -15580,49 +15537,6 @@ periodics:
         defaultMode: 256
         secretName: aws-cred
 
-- interval: 1h
-  agent: kubernetes
-  name: ci-kubernetes-e2e-kops-aws-slow
-  spec:
-    containers:
-    - args:
-      - --timeout=170
-      - --bare
-      env:
-      - name: GOOGLE_APPLICATION_CREDENTIALS
-        value: /etc/service-account/service-account.json
-      - name: USER
-        value: prow
-      - name: JENKINS_AWS_CREDENTIALS_FILE
-        value: /etc/aws-cred/credentials
-      - name: JENKINS_AWS_SSH_PRIVATE_KEY_FILE
-        value: /etc/aws-ssh/aws-ssh-private
-      - name: JENKINS_AWS_SSH_PUBLIC_KEY_FILE
-        value: /etc/aws-ssh/aws-ssh-public
-      image: gcr.io/k8s-testimages/kubekins-e2e:v20171023-364289b6-master
-      volumeMounts:
-      - mountPath: /etc/service-account
-        name: service
-        readOnly: true
-      - mountPath: /etc/aws-ssh
-        name: aws-ssh
-        readOnly: true
-      - mountPath: /etc/aws-cred
-        name: aws-cred
-        readOnly: true
-    volumes:
-    - name: service
-      secret:
-        secretName: service-account
-    - name: aws-ssh
-      secret:
-        defaultMode: 256
-        secretName: aws-ssh-key-secret
-    - name: aws-cred
-      secret:
-        defaultMode: 256
-        secretName: aws-cred
-
 - interval: 1h
   agent: kubernetes
   name: ci-kubernetes-e2e-kops-aws-stable1

diff --git a/testgrid/config/config.yaml b/testgrid/config/config.yaml
@@ -100,10 +100,6 @@ test_groups:
   gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-canary
 - name: ci-kubernetes-e2e-kops-aws-sig-cli
   gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-sig-cli
-- name: ci-kubernetes-e2e-kops-aws-slow
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-slow
-- name: ci-kubernetes-e2e-kops-aws-serial
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-serial
 - name: ci-kubernetes-e2e-kops-aws-release-1-6
   gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-release-1-6
 - name: ci-kubernetes-e2e-kops-aws-updown
@@ -1801,10 +1797,6 @@ dashboards:
     test_group_name: ci-kubernetes-e2e-kops-aws
   - name: kops-aws-canary
     test_group_name: ci-kubernetes-e2e-kops-aws-canary
-  - name: kops-aws-slow
-    test_group_name: ci-kubernetes-e2e-kops-aws-slow
-  - name: kops-aws-serial
-    test_group_name: ci-kubernetes-e2e-kops-aws-serial
   - name: kops-aws-1.6
     test_group_name: ci-kubernetes-e2e-kops-aws-release-1-6
   - name: kops-aws-1.7