diff --git a/charts/mungegithub/chart/values.kubernetes.kubernetes.yaml b/charts/mungegithub/chart/values.kubernetes.kubernetes.yaml index 0d3c5fc25a48..5ee545338d66 100644 --- a/charts/mungegithub/chart/values.kubernetes.kubernetes.yaml +++ b/charts/mungegithub/chart/values.kubernetes.kubernetes.yaml @@ -27,7 +27,6 @@ config: pull-kubernetes-unit,\ pull-kubernetes-verify,\ pull-kubernetes-node-e2e,\ - pull-kubernetes-kubemark-e2e-gce,\ pull-kubernetes-e2e-gce-etcd3,\ pull-kubernetes-bazel-build,\ pull-kubernetes-bazel-test,\ diff --git a/gubernator/config.yaml b/gubernator/config.yaml index 24008aac853c..57178e78b44a 100644 --- a/gubernator/config.yaml +++ b/gubernator/config.yaml @@ -33,7 +33,6 @@ jobs: - pull-kubernetes-e2e-gce-device-plugin-gpu - pull-kubernetes-e2e-kops-aws - pull-kubernetes-integration - - pull-kubernetes-kubemark-e2e-gce - pull-kubernetes-kubemark-e2e-gce-big - pull-kubernetes-node-e2e - pull-kubernetes-typecheck diff --git a/jobs/config.json b/jobs/config.json index ddac00f712a1..8cc2fdb82f7f 100644 --- a/jobs/config.json +++ b/jobs/config.json @@ -13204,30 +13204,6 @@ "sig-testing" ] }, - "pull-kubernetes-kubemark-e2e-gce": { - "args": [ - "--build=bazel", - "--cluster=", - "--env-file=jobs/env/ci-kubernetes-e2e-kubemark-common.env", - "--extract=local", - "--gcp-node-image=gci", - "--gcp-node-size=n1-standard-2", - "--gcp-nodes=1", - "--gcp-project=k8s-jkns-pr-kubemark", - "--gcp-zone=us-central1-f", - "--kubemark", - "--kubemark-nodes=5", - "--provider=gce", - "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce", - "--test=false", - "--test_args=--ginkgo.focus=\\[Feature:Empty\\] --gather-resource-usage=true", - "--timeout=60m" - ], - "scenario": "kubernetes_e2e", - "sigOwners": [ - "sig-scalability" - ] - }, "pull-kubernetes-kubemark-e2e-gce-big": { "args": [ "--build", @@ -13254,30 +13230,6 @@ "sig-scalability" ] }, - "pull-kubernetes-kubemark-e2e-gce-canary": { - "args": [ - "--build=bazel", - "--cluster=", - "--env-file=jobs/env/ci-kubernetes-e2e-kubemark-common.env", - "--extract=local", - "--gcp-node-image=gci", - "--gcp-node-size=n1-standard-2", - "--gcp-nodes=1", - "--gcp-project=k8s-jkns-pr-kubemark", - "--gcp-zone=us-central1-f", - "--kubemark", - "--kubemark-nodes=5", - "--provider=gce", - "--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-kubemark-e2e-gce-canary", - "--test=false", - "--test_args=--ginkgo.focus=\\[Feature:Empty\\] --gather-resource-usage=true", - "--timeout=60m" - ], - "scenario": "kubernetes_e2e", - "sigOwners": [ - "sig-scalability" - ] - }, "pull-kubernetes-kubemark-e2e-gce-scale": { "args": [ "--build", diff --git a/jobs/config_test.py b/jobs/config_test.py index 17a5a81a59d4..fc6f3bd1a859 100755 --- a/jobs/config_test.py +++ b/jobs/config_test.py @@ -585,9 +585,6 @@ def test_all_project_are_unique(self): 'ci-kubernetes-e2e-gci-gce-autoscaling-hpa':'ci-kubernetes-e2e-gci-gce-autoscaling', 'ci-kubernetes-e2e-gci-gce-autoscaling-migs-hpa':'ci-kubernetes-e2e-gci-gce-autoscaling-migs', 'ci-kubernetes-e2e-gci-gke-autoscaling-hpa':'ci-kubernetes-e2e-gci-gke-autoscaling', - # kubemark presubmits - 'pull-kubernetes-kubemark-e2e-gce-canary':'k8s-jkns-pr-kubemark', - 'pull-kubernetes-kubemark-e2e-gce':'k8s-jkns-pr-kubemark', # gpu+autoscaling jobs intentionally share projects with gpu tests 'ci-kubernetes-e2e-gci-gke-autoscaling-gpu-v100': 'ci-kubernetes-e2e-gke-staging-latest-device-plugin-gpu-v100', } diff --git a/maintenance/migratestatus/migrate-many.sh b/maintenance/migratestatus/migrate-many.sh index 64b86b9aece7..659474889fc4 100755 --- a/maintenance/migratestatus/migrate-many.sh +++ b/maintenance/migratestatus/migrate-many.sh @@ -36,7 +36,6 @@ bazel build //maintenance/migratestatus || exit 1 #migrate "Gubernator tests" pull-test-infra-gubernator #migrate "verify-bazel" pull-test-infra-verify-bazel -migrate "Jenkins Kubemark GCE e2e" pull-kubernetes-kubemark-e2e-gce migrate "Jenkins GCE etcd3 e2e" pull-kubernetes-e2e-gce-etcd3 migrate "Jenkins kops AWS e2e" pull-kubernetes-e2e-kops-aws migrate "Jenkins unit/integration" pull-kubernetes-unit diff --git a/metrics/configs/pr-consistency-config.yaml b/metrics/configs/pr-consistency-config.yaml index 95f936877387..94e8f0dcb6c7 100644 --- a/metrics/configs/pr-consistency-config.yaml +++ b/metrics/configs/pr-consistency-config.yaml @@ -42,9 +42,10 @@ query: | 'pr:pull-kubernetes-bazel-build', 'pr:pull-kubernetes-bazel-test', 'pr:pull-kubernetes-e2e-gce', + 'pr:pull-kubernetes-e2e-gce-100-performance', 'pr:pull-kubernetes-e2e-kops-aws', 'pr:pull-kubernetes-integration', - 'pr:pull-kubernetes-kubemark-e2e-gce', + 'pr:pull-kubernetes-kubemark-e2e-gce-big', 'pr:pull-kubernetes-node-e2e', 'pr:pull-kubernetes-typecheck', 'pr:pull-kubernetes-verify', diff --git a/metrics/configs/weekly-consistency-config.yaml b/metrics/configs/weekly-consistency-config.yaml index 964585031958..e52356b138b7 100644 --- a/metrics/configs/weekly-consistency-config.yaml +++ b/metrics/configs/weekly-consistency-config.yaml @@ -39,9 +39,10 @@ query: | 'pr:pull-kubernetes-bazel-build', 'pr:pull-kubernetes-bazel-test', 'pr:pull-kubernetes-e2e-gce', + 'pr:pull-kubernetes-e2e-gce-100-performance', 'pr:pull-kubernetes-e2e-kops-aws', 'pr:pull-kubernetes-integration', - 'pr:pull-kubernetes-kubemark-e2e-gce', + 'pr:pull-kubernetes-kubemark-e2e-gce-big', 'pr:pull-kubernetes-node-e2e', 'pr:pull-kubernetes-typecheck', 'pr:pull-kubernetes-verify', diff --git a/prow/config.yaml b/prow/config.yaml index 49c0044c77e2..682931646407 100644 --- a/prow/config.yaml +++ b/prow/config.yaml @@ -2780,17 +2780,18 @@ presubmits: volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce + - name: pull-kubernetes-kubemark-e2e-gce-big agent: kubernetes always_run: true + skip_report: false max_concurrency: 12 skip_branches: - release-1.10 # per-release image - release-1.9 # per-release image - release-1.8 # per-release image - context: pull-kubernetes-kubemark-e2e-gce - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce" - trigger: "(?m)^/test( all| pull-kubernetes-kubemark-e2e-gce),?(\\s+|$)" + context: pull-kubernetes-kubemark-e2e-gce-big + rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" + trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" @@ -2805,7 +2806,7 @@ presubmits: - "--repo=k8s.io/release" - "--service-account=/etc/service-account/service-account.json" - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=110" + - "--timeout=120" env: # TODO(krzyzacy): Figure out bazel built kubemark image # - name: KUBEMARK_BAZEL_BUILD @@ -2824,15 +2825,16 @@ presubmits: volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce + - name: pull-kubernetes-kubemark-e2e-gce-big agent: kubernetes always_run: true + skip_report: false max_concurrency: 12 branches: - release-1.10 # per-release image - context: pull-kubernetes-kubemark-e2e-gce - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce" - trigger: "(?m)^/test( all| pull-kubernetes-kubemark-e2e-gce),?(\\s+|$)" + context: pull-kubernetes-kubemark-e2e-gce-big + rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" + trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" @@ -2847,7 +2849,7 @@ presubmits: - "--repo=k8s.io/release" - "--service-account=/etc/service-account/service-account.json" - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=110" + - "--timeout=120" env: # TODO(krzyzacy): Figure out bazel built kubemark image # - name: KUBEMARK_BAZEL_BUILD @@ -2866,15 +2868,16 @@ presubmits: volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce + - name: pull-kubernetes-kubemark-e2e-gce-big agent: kubernetes always_run: true + skip_report: false max_concurrency: 12 branches: - release-1.9 # per-release image - context: pull-kubernetes-kubemark-e2e-gce - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce" - trigger: "(?m)^/test( all| pull-kubernetes-kubemark-e2e-gce),?(\\s+|$)" + context: pull-kubernetes-kubemark-e2e-gce-big + rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" + trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" @@ -2889,49 +2892,7 @@ presubmits: - "--repo=k8s.io/release" - "--service-account=/etc/service-account/service-account.json" - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=110" - env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # Bazel needs privileged mode in order to sandbox builds. - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph - resources: - requests: - memory: "6Gi" - volumes: - - name: docker-graph - emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce - agent: kubernetes - always_run: true - max_concurrency: 12 - branches: - - release-1.8 - context: pull-kubernetes-kubemark-e2e-gce - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce" - trigger: "(?m)^/test( all| pull-kubernetes-kubemark-e2e-gce),?(\\s+|$)" - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--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=110" + - "--timeout=120" env: # TODO(krzyzacy): Figure out bazel built kubemark image # - name: KUBEMARK_BAZEL_BUILD @@ -2952,23 +2913,21 @@ presubmits: emptyDir: {} - name: pull-kubernetes-kubemark-e2e-gce-big agent: kubernetes - always_run: true + always_run: false skip_report: false max_concurrency: 12 - skip_branches: - - release-1.10 # per-release image - - release-1.9 # per-release image - - release-1.8 # per-release image + branches: + - release-1.8 context: pull-kubernetes-kubemark-e2e-gce-big rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" - trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)" + trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-big,?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 args: - --root=/go/src - "--job=$(JOB_NAME)" @@ -2995,23 +2954,23 @@ presubmits: volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-big + + - name: pull-kubernetes-kubemark-e2e-gce-scale agent: kubernetes - always_run: true - skip_report: false - max_concurrency: 12 + always_run: false + max_concurrency: 1 branches: - - release-1.10 # per-release image - context: pull-kubernetes-kubemark-e2e-gce-big - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" - trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)" + - master + context: pull-kubernetes-kubemark-e2e-gce-scale + rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-scale" + trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-scale,?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master args: - --root=/go/src - "--job=$(JOB_NAME)" @@ -3019,7 +2978,7 @@ presubmits: - "--repo=k8s.io/release" - "--service-account=/etc/service-account/service-account.json" - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=120" + - "--timeout=1220" env: # TODO(krzyzacy): Figure out bazel built kubemark image # - name: KUBEMARK_BAZEL_BUILD @@ -3038,481 +2997,177 @@ presubmits: volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-big + + - name: pull-kubernetes-local-e2e agent: kubernetes - always_run: true - skip_report: false - max_concurrency: 12 branches: - - release-1.9 # per-release image - context: pull-kubernetes-kubemark-e2e-gce-big - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" - trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)" + - master + always_run: false + skip_report: false + max_concurrency: 8 + context: pull-kubernetes-local-e2e + rerun_command: "/test pull-kubernetes-local-e2e" + trigger: "(?m)^/test pull-kubernetes-local-e2e,?(\\s+|$)" + run_if_changed: '(hyperkube|local-up-cluster)' labels: preset-service-account: "true" preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master args: - --root=/go/src - "--job=$(JOB_NAME)" - "--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" + - "--timeout=140" env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - name: DOCKER_IN_DOCKER_ENABLED value: "true" - # Bazel needs privileged mode in order to sandbox builds. + # docker-in-docker needs privileged mode securityContext: privileged: true volumeMounts: - name: docker-graph mountPath: /docker-graph - resources: - requests: - memory: "6Gi" volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-big + + - name: pull-kubernetes-local-e2e-containerized agent: kubernetes + branches: + - master always_run: false skip_report: false - max_concurrency: 12 - branches: - - release-1.8 - context: pull-kubernetes-kubemark-e2e-gce-big - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big" - trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-big,?(\\s+|$)" + context: pull-kubernetes-local-e2e-containerized + rerun_command: "/test pull-kubernetes-local-e2e-containerized" + trigger: "(?m)^/test pull-kubernetes-local-e2e-containerized,?(\\s+|$)" + run_if_changed: '^(pkg|cmd)/kubelet.*$' labels: preset-service-account: "true" preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master args: - --root=/go/src - "--job=$(JOB_NAME)" - "--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" + - "--timeout=140" env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" + - name: DOCKERIZE_KUBELET + value: "true" - name: DOCKER_IN_DOCKER_ENABLED value: "true" - # Bazel needs privileged mode in order to sandbox builds. + # docker-in-docker needs privileged mode securityContext: privileged: true volumeMounts: - name: docker-graph mountPath: /docker-graph - resources: - requests: - memory: "6Gi" volumes: - name: docker-graph emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-canary + - name: pull-kubernetes-node-e2e agent: kubernetes - always_run: false - max_concurrency: 5 skip_branches: - release-1.10 # per-release image - release-1.9 # per-release image - release-1.8 # per-release image - context: pull-kubernetes-kubemark-e2e-gce-canary - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-canary" - trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-canary,?(\\s+|$)" + always_run: true + max_concurrency: 12 + context: pull-kubernetes-node-e2e + rerun_command: "/test pull-kubernetes-node-e2e" + trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:latest-master - imagePullPolicy: Always + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master args: - --root=/go/src - "--job=$(JOB_NAME)" - "--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=110" - env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # Bazel needs privileged mode in order to sandbox builds. - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph + - "--timeout=90" + - "--" # end bootstrap args, scenario args below + - "--node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml" + ports: resources: requests: memory: "6Gi" - volumes: - - name: docker-graph - emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-canary + - name: pull-kubernetes-node-e2e agent: kubernetes - always_run: false - max_concurrency: 5 branches: - release-1.10 # per-release image - context: pull-kubernetes-kubemark-e2e-gce-canary - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-canary" - trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-canary,?(\\s+|$)" + always_run: true + max_concurrency: 12 + context: pull-kubernetes-node-e2e + rerun_command: "/test pull-kubernetes-node-e2e" + trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:latest-1.10 - imagePullPolicy: Always + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 args: - --root=/go/src - "--job=$(JOB_NAME)" - "--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=110" - env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # Bazel needs privileged mode in order to sandbox builds. - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph + - "--timeout=90" + - "--" # end bootstrap args, scenario args below + - "--node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml" + ports: resources: requests: memory: "6Gi" - volumes: - - name: docker-graph - emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-canary + - name: pull-kubernetes-node-e2e agent: kubernetes - always_run: false - max_concurrency: 5 branches: - release-1.9 # per-release image - context: pull-kubernetes-kubemark-e2e-gce-canary - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-canary" - trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-canary,?(\\s+|$)" + always_run: true + max_concurrency: 12 + context: pull-kubernetes-node-e2e + rerun_command: "/test pull-kubernetes-node-e2e" + trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" spec: containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:latest-1.9 - imagePullPolicy: Always + - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 args: - --root=/go/src - "--job=$(JOB_NAME)" - "--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=110" - env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # Bazel needs privileged mode in order to sandbox builds. - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph + - "--timeout=90" + - "--" # end bootstrap args, scenario args below + - "--node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml" + ports: resources: requests: memory: "6Gi" - volumes: - - name: docker-graph - emptyDir: {} - - name: pull-kubernetes-kubemark-e2e-gce-canary + - name: pull-kubernetes-node-e2e agent: kubernetes - always_run: false - max_concurrency: 5 branches: - release-1.8 - context: pull-kubernetes-kubemark-e2e-gce-canary - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-canary" - trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-canary,?(\\s+|$)" - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:latest-1.8 - imagePullPolicy: Always - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--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=110" - env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # Bazel needs privileged mode in order to sandbox builds. - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph - resources: - requests: - memory: "6Gi" - volumes: - - name: docker-graph - emptyDir: {} - - - name: pull-kubernetes-kubemark-e2e-gce-scale - agent: kubernetes - always_run: false - max_concurrency: 1 - branches: - - master - context: pull-kubernetes-kubemark-e2e-gce-scale - rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-scale" - trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-scale,?(\\s+|$)" - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - preset-bazel-scratch-dir: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--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=1220" - env: - # TODO(krzyzacy): Figure out bazel built kubemark image - # - name: KUBEMARK_BAZEL_BUILD - # value: "y" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # Bazel needs privileged mode in order to sandbox builds. - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph - resources: - requests: - memory: "6Gi" - volumes: - - name: docker-graph - emptyDir: {} - - - name: pull-kubernetes-local-e2e - agent: kubernetes - branches: - - master - always_run: false - skip_report: false - max_concurrency: 8 - context: pull-kubernetes-local-e2e - rerun_command: "/test pull-kubernetes-local-e2e" - trigger: "(?m)^/test pull-kubernetes-local-e2e,?(\\s+|$)" - run_if_changed: '(hyperkube|local-up-cluster)' - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)" - - "--service-account=/etc/service-account/service-account.json" - - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=140" - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # docker-in-docker needs privileged mode - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph - volumes: - - name: docker-graph - emptyDir: {} - - - name: pull-kubernetes-local-e2e-containerized - agent: kubernetes - branches: - - master - always_run: false - skip_report: false - context: pull-kubernetes-local-e2e-containerized - rerun_command: "/test pull-kubernetes-local-e2e-containerized" - trigger: "(?m)^/test pull-kubernetes-local-e2e-containerized,?(\\s+|$)" - run_if_changed: '^(pkg|cmd)/kubelet.*$' - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)" - - "--service-account=/etc/service-account/service-account.json" - - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=140" - env: - - name: DOCKERIZE_KUBELET - value: "true" - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - # docker-in-docker needs privileged mode - securityContext: - privileged: true - volumeMounts: - - name: docker-graph - mountPath: /docker-graph - volumes: - - name: docker-graph - emptyDir: {} - - - name: pull-kubernetes-node-e2e - agent: kubernetes - skip_branches: - - release-1.10 # per-release image - - release-1.9 # per-release image - - release-1.8 # per-release image - always_run: true - max_concurrency: 12 - context: pull-kubernetes-node-e2e - rerun_command: "/test pull-kubernetes-node-e2e" - trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)" - - "--service-account=/etc/service-account/service-account.json" - - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=90" - - "--" # end bootstrap args, scenario args below - - "--node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml" - ports: - resources: - requests: - memory: "6Gi" - - name: pull-kubernetes-node-e2e - agent: kubernetes - branches: - - release-1.10 # per-release image - always_run: true - max_concurrency: 12 - context: pull-kubernetes-node-e2e - rerun_command: "/test pull-kubernetes-node-e2e" - trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)" - - "--service-account=/etc/service-account/service-account.json" - - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=90" - - "--" # end bootstrap args, scenario args below - - "--node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml" - ports: - resources: - requests: - memory: "6Gi" - - name: pull-kubernetes-node-e2e - agent: kubernetes - branches: - - release-1.9 # per-release image - always_run: true - max_concurrency: 12 - context: pull-kubernetes-node-e2e - rerun_command: "/test pull-kubernetes-node-e2e" - trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" - labels: - preset-service-account: "true" - preset-k8s-ssh: "true" - spec: - containers: - - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 - args: - - --root=/go/src - - "--job=$(JOB_NAME)" - - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)" - - "--service-account=/etc/service-account/service-account.json" - - "--upload=gs://kubernetes-jenkins/pr-logs" - - "--timeout=90" - - "--" # end bootstrap args, scenario args below - - "--node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml" - ports: - resources: - requests: - memory: "6Gi" - - name: pull-kubernetes-node-e2e - agent: kubernetes - branches: - - release-1.8 - always_run: true - max_concurrency: 12 - context: pull-kubernetes-node-e2e - rerun_command: "/test pull-kubernetes-node-e2e" - trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" + always_run: true + max_concurrency: 12 + context: pull-kubernetes-node-e2e + rerun_command: "/test pull-kubernetes-node-e2e" + trigger: "(?m)^/test( all| pull-kubernetes-node-e2e),?(\\s+|$)" labels: preset-service-account: "true" preset-k8s-ssh: "true" @@ -4809,382 +4464,38 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gce-big-performance,?(\s+|$) - - agent: kubernetes - always_run: true - cluster: security - context: pull-security-kubernetes-e2e-gce-device-plugin-gpu - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-gce-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu - run_if_changed: "" - skip_branches: - - release-1.10 - - release-1.9 - - release-1.8 - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - - agent: kubernetes - always_run: true - branches: - - release-1.10 - cluster: security - context: pull-security-kubernetes-e2e-gce-device-plugin-gpu - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-gce-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu - run_if_changed: "" - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - - agent: kubernetes - always_run: true - branches: - - release-1.9 - cluster: security - context: pull-security-kubernetes-e2e-gce-device-plugin-gpu - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-gce-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu - run_if_changed: "" - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - - agent: kubernetes - always_run: true - branches: - - release-1.8 - cluster: security - context: pull-security-kubernetes-e2e-gce-device-plugin-gpu - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-gce-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu - run_if_changed: "" - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - - agent: kubernetes - always_run: false - branches: - - master - cluster: security - context: pull-security-kubernetes-e2e-gce-large-performance - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 1 - name: pull-security-kubernetes-e2e-gce-large-performance - rerun_command: /test pull-security-kubernetes-e2e-gce-large-performance - run_if_changed: "" - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=570 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-large-performance - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gce-large-performance,?(\s+|$) - - agent: kubernetes - always_run: false - cluster: security - context: pull-security-kubernetes-e2e-gke - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 0 - name: pull-security-kubernetes-e2e-gke - rerun_command: /test pull-security-kubernetes-e2e-gke - run_if_changed: ^(cluster/gce|cluster/addons).*$ - skip_branches: - - release-1.10 - - release-1.9 - - release-1.8 - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) - - agent: kubernetes - always_run: false - branches: - - release-1.10 - cluster: security - context: pull-security-kubernetes-e2e-gke - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 0 - name: pull-security-kubernetes-e2e-gke - rerun_command: /test pull-security-kubernetes-e2e-gke - run_if_changed: ^(cluster/gce|cluster/addons).*$ - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) - - agent: kubernetes - always_run: false - branches: - - release-1.9 - cluster: security - context: pull-security-kubernetes-e2e-gke - labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" - preset-service-account: "true" - max_concurrency: 0 - name: pull-security-kubernetes-e2e-gke - rerun_command: /test pull-security-kubernetes-e2e-gke - run_if_changed: ^(cluster/gce|cluster/addons).*$ - skip_report: false - spec: - containers: - - args: - - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - - --repo=k8s.io/release - - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 - name: "" - resources: - requests: - memory: 6Gi - securityContext: - privileged: true - volumeMounts: - - mountPath: /etc/ssh-security - name: ssh-security - volumes: - - name: ssh-security - secret: - defaultMode: 256 - secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gce-big-performance,?(\s+|$) - agent: kubernetes - always_run: false - branches: - - release-1.8 + always_run: true cluster: security - context: pull-security-kubernetes-e2e-gke + context: pull-security-kubernetes-e2e-gce-device-plugin-gpu labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 0 - name: pull-security-kubernetes-e2e-gke - rerun_command: /test pull-security-kubernetes-e2e-gke - run_if_changed: ^(cluster/gce|cluster/addons).*$ + max_concurrency: 12 + name: pull-security-kubernetes-e2e-gce-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu + run_if_changed: "" + skip_branches: + - release-1.10 + - release-1.9 + - release-1.8 skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security - --root=/go/src - - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) + - --job=$(JOB_NAME) + - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - --repo=k8s.io/release + - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master name: "" resources: requests: @@ -5199,23 +4510,21 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - agent: kubernetes - always_run: false + always_run: true + branches: + - release-1.10 cluster: security - context: pull-security-kubernetes-e2e-gke-device-plugin-gpu + context: pull-security-kubernetes-e2e-gce-device-plugin-gpu labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 1 - name: pull-security-kubernetes-e2e-gke-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu + max_concurrency: 12 + name: pull-security-kubernetes-e2e-gce-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu run_if_changed: "" - skip_branches: - - release-1.10 - - release-1.9 - - release-1.8 skip_report: false spec: containers: @@ -5229,8 +4538,8 @@ presubmits: - --upload=gs://kubernetes-security-prow/pr-logs - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 name: "" resources: requests: @@ -5245,20 +4554,20 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - agent: kubernetes - always_run: false + always_run: true branches: - - release-1.10 + - release-1.9 cluster: security - context: pull-security-kubernetes-e2e-gke-device-plugin-gpu + context: pull-security-kubernetes-e2e-gce-device-plugin-gpu labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 1 - name: pull-security-kubernetes-e2e-gke-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu + max_concurrency: 12 + name: pull-security-kubernetes-e2e-gce-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu run_if_changed: "" skip_report: false spec: @@ -5273,8 +4582,8 @@ presubmits: - --upload=gs://kubernetes-security-prow/pr-logs - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 name: "" resources: requests: @@ -5289,20 +4598,20 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - agent: kubernetes - always_run: false + always_run: true branches: - - release-1.9 + - release-1.8 cluster: security - context: pull-security-kubernetes-e2e-gke-device-plugin-gpu + context: pull-security-kubernetes-e2e-gce-device-plugin-gpu labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 1 - name: pull-security-kubernetes-e2e-gke-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu + max_concurrency: 12 + name: pull-security-kubernetes-e2e-gce-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gce-device-plugin-gpu run_if_changed: "" skip_report: false spec: @@ -5317,8 +4626,8 @@ presubmits: - --upload=gs://kubernetes-security-prow/pr-logs - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 name: "" resources: requests: @@ -5333,20 +4642,20 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-gce-device-plugin-gpu),?(\s+|$) - agent: kubernetes always_run: false branches: - - release-1.8 + - master cluster: security - context: pull-security-kubernetes-e2e-gke-device-plugin-gpu + context: pull-security-kubernetes-e2e-gce-large-performance labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" max_concurrency: 1 - name: pull-security-kubernetes-e2e-gke-device-plugin-gpu - rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu + name: pull-security-kubernetes-e2e-gce-large-performance + rerun_command: /test pull-security-kubernetes-e2e-gce-large-performance run_if_changed: "" skip_report: false spec: @@ -5354,15 +4663,13 @@ presubmits: - args: - --ssh=/etc/ssh-security/ssh-security - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=90 + - --timeout=570 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gce-large-performance + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master name: "" resources: requests: @@ -5377,20 +4684,19 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gce-large-performance,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false cluster: security - context: pull-security-kubernetes-e2e-kops-aws + context: pull-security-kubernetes-e2e-gke labels: - preset-aws-credential: "true" - preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" + preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-kops-aws - rerun_command: /test pull-security-kubernetes-e2e-kops-aws - run_if_changed: "" + max_concurrency: 0 + name: pull-security-kubernetes-e2e-gke + rerun_command: /test pull-security-kubernetes-e2e-gke + run_if_changed: ^(cluster/gce|cluster/addons).*$ skip_branches: - release-1.10 - release-1.9 @@ -5401,14 +4707,12 @@ presubmits: - args: - --ssh=/etc/ssh-security/ssh-security - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=75 + - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master name: "" resources: @@ -5424,36 +4728,33 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false branches: - release-1.10 cluster: security - context: pull-security-kubernetes-e2e-kops-aws + context: pull-security-kubernetes-e2e-gke labels: - preset-aws-credential: "true" - preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" + preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-kops-aws - rerun_command: /test pull-security-kubernetes-e2e-kops-aws - run_if_changed: "" + max_concurrency: 0 + name: pull-security-kubernetes-e2e-gke + rerun_command: /test pull-security-kubernetes-e2e-gke + run_if_changed: ^(cluster/gce|cluster/addons).*$ skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=75 + - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 name: "" resources: @@ -5469,36 +4770,33 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false branches: - release-1.9 cluster: security - context: pull-security-kubernetes-e2e-kops-aws + context: pull-security-kubernetes-e2e-gke labels: - preset-aws-credential: "true" - preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" + preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-kops-aws - rerun_command: /test pull-security-kubernetes-e2e-kops-aws - run_if_changed: "" + max_concurrency: 0 + name: pull-security-kubernetes-e2e-gke + rerun_command: /test pull-security-kubernetes-e2e-gke + run_if_changed: ^(cluster/gce|cluster/addons).*$ skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=75 + - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 name: "" resources: @@ -5514,36 +4812,33 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false branches: - release-1.8 cluster: security - context: pull-security-kubernetes-e2e-kops-aws + context: pull-security-kubernetes-e2e-gke labels: - preset-aws-credential: "true" - preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" + preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-e2e-kops-aws - rerun_command: /test pull-security-kubernetes-e2e-kops-aws - run_if_changed: "" + max_concurrency: 0 + name: pull-security-kubernetes-e2e-gke + rerun_command: /test pull-security-kubernetes-e2e-gke + run_if_changed: ^(cluster/gce|cluster/addons).*$ skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security - --root=/go/src - - --job=$(JOB_NAME) - - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=github.com/kubernetes-security/kubernetes=$(PULL_REFS) - --repo=k8s.io/release - - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=75 + - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 name: "" resources: @@ -5559,110 +4854,111 @@ presubmits: secret: defaultMode: 256 secretName: ssh-security - trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false cluster: security - context: pull-security-kubernetes-integration + context: pull-security-kubernetes-e2e-gke-device-plugin-gpu labels: + preset-bazel-scratch-dir: "true" + preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 0 - name: pull-security-kubernetes-integration - rerun_command: /test pull-security-kubernetes-integration + max_concurrency: 1 + name: pull-security-kubernetes-e2e-gke-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu run_if_changed: "" + skip_branches: + - release-1.10 + - release-1.9 + - release-1.8 skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security + - --root=/go/src - --job=$(JOB_NAME) - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=60 - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/bootstrap:v20180510-809cd85b5 + - --timeout=90 + - -- + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master name: "" resources: requests: - cpu: "4" + memory: 6Gi securityContext: privileged: true volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test( all| pull-security-kubernetes-integration),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) - agent: kubernetes always_run: false + branches: + - release-1.10 cluster: security - context: pull-security-kubernetes-integration-prow + context: pull-security-kubernetes-e2e-gke-device-plugin-gpu labels: + preset-bazel-scratch-dir: "true" + preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 0 - name: pull-security-kubernetes-integration-prow - rerun_command: /test pull-security-kubernetes-integration-prow + max_concurrency: 1 + name: pull-security-kubernetes-e2e-gke-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu run_if_changed: "" skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security + - --root=/go/src - --job=$(JOB_NAME) - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) + - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=60 - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/bootstrap:latest - imagePullPolicy: Always + - --timeout=90 + - -- + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 name: "" resources: requests: - cpu: "4" + memory: 6Gi securityContext: privileged: true volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test pull-security-kubernetes-integration-prow,?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false + branches: + - release-1.9 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce + context: pull-security-kubernetes-e2e-gke-device-plugin-gpu labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce + max_concurrency: 1 + name: pull-security-kubernetes-e2e-gke-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu run_if_changed: "" - skip_branches: - - release-1.10 - - release-1.9 - - release-1.8 skip_report: false spec: containers: @@ -5674,13 +4970,10 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 name: "" resources: requests: @@ -5690,29 +4983,25 @@ presubmits: volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test( all| pull-security-kubernetes-kubemark-e2e-gce),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) - agent: kubernetes - always_run: true + always_run: false branches: - - release-1.10 + - release-1.8 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce + context: pull-security-kubernetes-e2e-gke-device-plugin-gpu labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce + max_concurrency: 1 + name: pull-security-kubernetes-e2e-gke-device-plugin-gpu + rerun_command: /test pull-security-kubernetes-e2e-gke-device-plugin-gpu run_if_changed: "" skip_report: false spec: @@ -5725,13 +5014,10 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=90 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-gke-device-plugin-gpu + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 name: "" resources: requests: @@ -5741,30 +5027,29 @@ presubmits: volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test( all| pull-security-kubernetes-kubemark-e2e-gce),?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-e2e-gke-device-plugin-gpu,?(\s+|$) - agent: kubernetes always_run: true - branches: - - release-1.9 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce + context: pull-security-kubernetes-e2e-kops-aws labels: + preset-aws-credential: "true" + preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" preset-service-account: "true" max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce + name: pull-security-kubernetes-e2e-kops-aws + rerun_command: /test pull-security-kubernetes-e2e-kops-aws run_if_changed: "" + skip_branches: + - release-1.10 + - release-1.9 + - release-1.8 skip_report: false spec: containers: @@ -5776,13 +5061,10 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=75 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master name: "" resources: requests: @@ -5792,29 +5074,26 @@ presubmits: volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test( all| pull-security-kubernetes-kubemark-e2e-gce),?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) - agent: kubernetes always_run: true branches: - - release-1.8 + - release-1.10 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce + context: pull-security-kubernetes-e2e-kops-aws labels: + preset-aws-credential: "true" + preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" preset-service-account: "true" max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce + name: pull-security-kubernetes-e2e-kops-aws + rerun_command: /test pull-security-kubernetes-e2e-kops-aws run_if_changed: "" skip_report: false spec: @@ -5827,13 +5106,10 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=75 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 name: "" resources: requests: @@ -5843,32 +5119,27 @@ presubmits: volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test( all| pull-security-kubernetes-kubemark-e2e-gce),?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) - agent: kubernetes always_run: true + branches: + - release-1.9 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-big + context: pull-security-kubernetes-e2e-kops-aws labels: + preset-aws-credential: "true" + preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" preset-service-account: "true" max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce-big - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big + name: pull-security-kubernetes-e2e-kops-aws + rerun_command: /test pull-security-kubernetes-e2e-kops-aws run_if_changed: "" - skip_branches: - - release-1.10 - - release-1.9 - - release-1.8 skip_report: false spec: containers: @@ -5880,13 +5151,10 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=120 + - --timeout=75 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 name: "" resources: requests: @@ -5896,29 +5164,26 @@ presubmits: volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) - agent: kubernetes always_run: true branches: - - release-1.10 + - release-1.8 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-big + context: pull-security-kubernetes-e2e-kops-aws labels: + preset-aws-credential: "true" + preset-aws-ssh: "true" preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" preset-service-account: "true" max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce-big - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big + name: pull-security-kubernetes-e2e-kops-aws + rerun_command: /test pull-security-kubernetes-e2e-kops-aws run_if_changed: "" skip_report: false spec: @@ -5931,13 +5196,10 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=120 + - --timeout=75 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big - env: - - name: DOCKER_IN_DOCKER_ENABLED - value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-e2e-kops-aws + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 name: "" resources: requests: @@ -5947,52 +5209,40 @@ presubmits: volumeMounts: - mountPath: /etc/ssh-security name: ssh-security - - mountPath: /docker-graph - name: auto-generated-docker-graph-volume-mount volumes: - name: ssh-security secret: defaultMode: 256 secretName: ssh-security - - emptyDir: {} - name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-e2e-kops-aws),?(\s+|$) - agent: kubernetes always_run: true - branches: - - release-1.9 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-big + context: pull-security-kubernetes-integration labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce-big - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big + max_concurrency: 0 + name: pull-security-kubernetes-integration + rerun_command: /test pull-security-kubernetes-integration run_if_changed: "" skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - --job=$(JOB_NAME) - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=120 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big + - --timeout=60 env: - name: DOCKER_IN_DOCKER_ENABLED value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 + image: gcr.io/k8s-testimages/bootstrap:v20180510-809cd85b5 name: "" resources: requests: - memory: 6Gi + cpu: "4" securityContext: privileged: true volumeMounts: @@ -6007,43 +5257,36 @@ presubmits: secretName: ssh-security - emptyDir: {} name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$) + trigger: (?m)^/test( all| pull-security-kubernetes-integration),?(\s+|$) - agent: kubernetes always_run: false - branches: - - release-1.8 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-big + context: pull-security-kubernetes-integration-prow labels: - preset-bazel-scratch-dir: "true" - preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 12 - name: pull-security-kubernetes-kubemark-e2e-gce-big - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big + max_concurrency: 0 + name: pull-security-kubernetes-integration-prow + rerun_command: /test pull-security-kubernetes-integration-prow run_if_changed: "" skip_report: false spec: containers: - args: - --ssh=/etc/ssh-security/ssh-security - - --root=/go/src - --job=$(JOB_NAME) - --repo=github.com/kubernetes-security/$(REPO_NAME)=$(PULL_REFS) - - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=120 - - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big + - --timeout=60 env: - name: DOCKER_IN_DOCKER_ENABLED value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 + image: gcr.io/k8s-testimages/bootstrap:latest + imagePullPolicy: Always name: "" resources: requests: - memory: 6Gi + cpu: "4" securityContext: privileged: true volumeMounts: @@ -6058,18 +5301,18 @@ presubmits: secretName: ssh-security - emptyDir: {} name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-big,?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-integration-prow,?(\s+|$) - agent: kubernetes - always_run: false + always_run: true cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-canary + context: pull-security-kubernetes-kubemark-e2e-gce-big labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 5 - name: pull-security-kubernetes-kubemark-e2e-gce-canary - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-canary + max_concurrency: 12 + name: pull-security-kubernetes-kubemark-e2e-gce-big + rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big run_if_changed: "" skip_branches: - release-1.10 @@ -6086,14 +5329,13 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=120 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-canary + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big env: - name: DOCKER_IN_DOCKER_ENABLED value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:latest-master - imagePullPolicy: Always + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-master name: "" resources: requests: @@ -6112,20 +5354,20 @@ presubmits: secretName: ssh-security - emptyDir: {} name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-canary,?(\s+|$) + trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$) - agent: kubernetes - always_run: false + always_run: true branches: - release-1.10 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-canary + context: pull-security-kubernetes-kubemark-e2e-gce-big labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 5 - name: pull-security-kubernetes-kubemark-e2e-gce-canary - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-canary + max_concurrency: 12 + name: pull-security-kubernetes-kubemark-e2e-gce-big + rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big run_if_changed: "" skip_report: false spec: @@ -6138,14 +5380,13 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=120 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-canary + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big env: - name: DOCKER_IN_DOCKER_ENABLED value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:latest-1.10 - imagePullPolicy: Always + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.10 name: "" resources: requests: @@ -6164,20 +5405,20 @@ presubmits: secretName: ssh-security - emptyDir: {} name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-canary,?(\s+|$) + trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$) - agent: kubernetes - always_run: false + always_run: true branches: - release-1.9 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-canary + context: pull-security-kubernetes-kubemark-e2e-gce-big labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 5 - name: pull-security-kubernetes-kubemark-e2e-gce-canary - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-canary + max_concurrency: 12 + name: pull-security-kubernetes-kubemark-e2e-gce-big + rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big run_if_changed: "" skip_report: false spec: @@ -6190,14 +5431,13 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=120 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-canary + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big env: - name: DOCKER_IN_DOCKER_ENABLED value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:latest-1.9 - imagePullPolicy: Always + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.9 name: "" resources: requests: @@ -6216,20 +5456,20 @@ presubmits: secretName: ssh-security - emptyDir: {} name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-canary,?(\s+|$) + trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$) - agent: kubernetes always_run: false branches: - release-1.8 cluster: security - context: pull-security-kubernetes-kubemark-e2e-gce-canary + context: pull-security-kubernetes-kubemark-e2e-gce-big labels: preset-bazel-scratch-dir: "true" preset-k8s-ssh: "true" preset-service-account: "true" - max_concurrency: 5 - name: pull-security-kubernetes-kubemark-e2e-gce-canary - rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-canary + max_concurrency: 12 + name: pull-security-kubernetes-kubemark-e2e-gce-big + rerun_command: /test pull-security-kubernetes-kubemark-e2e-gce-big run_if_changed: "" skip_report: false spec: @@ -6242,14 +5482,13 @@ presubmits: - --repo=k8s.io/release - --service-account=/etc/service-account/service-account.json - --upload=gs://kubernetes-security-prow/pr-logs - - --timeout=110 + - --timeout=120 - -- - - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-canary + - --stage=gs://kubernetes-security-prow/ci/pull-security-kubernetes-kubemark-e2e-gce-big env: - name: DOCKER_IN_DOCKER_ENABLED value: "true" - image: gcr.io/k8s-testimages/kubekins-e2e:latest-1.8 - imagePullPolicy: Always + image: gcr.io/k8s-testimages/kubekins-e2e:v20180605-65a672b59-1.8 name: "" resources: requests: @@ -6268,7 +5507,7 @@ presubmits: secretName: ssh-security - emptyDir: {} name: auto-generated-docker-graph-volume-mount - trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-canary,?(\s+|$) + trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-big,?(\s+|$) - agent: kubernetes always_run: false branches: diff --git a/testgrid/config.yaml b/testgrid/config.yaml index c0054dbcf836..fe293bd99032 100644 --- a/testgrid/config.yaml +++ b/testgrid/config.yaml @@ -2202,14 +2202,7 @@ test_groups: - name: pull-kubernetes-e2e-containerd-gce gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-e2e-containerd-gce num_columns_recent: 20 -- name: pull-kubernetes-kubemark-e2e-gce - gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-kubemark-e2e-gce - num_columns_recent: 20 - alert_stale_results_hours: 24 num_failures_to_alert: 10 -- name: pull-kubernetes-kubemark-e2e-gce-canary - gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-kubemark-e2e-gce-canary - num_columns_recent: 20 - name: pull-kubernetes-kubemark-e2e-gce-big gcs_prefix: kubernetes-jenkins/pr-logs/directory/pull-kubernetes-kubemark-e2e-gce-big num_columns_recent: 20 @@ -6076,13 +6069,18 @@ dashboards: base_options: 'width=10' alert_options: alert_mail_to_addresses: 'michelle.192837+alerts@gmail.com, lusensjtu+alerts@gmail.com, bentheelder+alerts@google.com' + - name: pull-kubernetes-e2e-gce-100-performance + test_group_name: pull-kubernetes-e2e-gce-100-performance + base_options: 'width=10' + alert_options: + alert_mail_to_addresses: 'michelle.192837+alerts@gmail.com, lusensjtu+alerts@gmail.com' - name: pull-kubernetes-e2e-kops-aws test_group_name: pull-kubernetes-e2e-kops-aws base_options: 'width=10' alert_options: alert_mail_to_addresses: 'michelle.192837+alerts@gmail.com, lusensjtu+alerts@gmail.com' - - name: pull-kubernetes-kubemark-e2e-gce - test_group_name: pull-kubernetes-kubemark-e2e-gce + - name: pull-kubernetes-kubemark-e2e-gce-big + test_group_name: pull-kubernetes-kubemark-e2e-gce-big base_options: 'width=10' alert_options: alert_mail_to_addresses: 'michelle.192837+alerts@gmail.com, lusensjtu+alerts@gmail.com' @@ -6141,9 +6139,6 @@ dashboards: - name: pull-kubernetes-kubemark-e2e-gce-scale test_group_name: pull-kubernetes-kubemark-e2e-gce-scale base_options: 'width=10' - - name: pull-kubernetes-kubemark-e2e-gce-canary - test_group_name: pull-kubernetes-kubemark-e2e-gce-canary - base_options: 'width=10' - name: presubmits-test-infra dashboard_tab: