Skip to content

Commit

Permalink
Merge pull request #9940 from gyuho/eks
Browse files Browse the repository at this point in the history
*: add EKS periodic jobs, upgrade "awstester" vendor
  • Loading branch information
k8s-ci-robot authored Oct 30, 2018
2 parents 5240ae4 + 97065dd commit 27957ef
Show file tree
Hide file tree
Showing 23 changed files with 686 additions and 550 deletions.
4 changes: 2 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions config/jobs/kubernetes/sig-aws/eks/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
approvers:
- gyuho
- d-nishi
118 changes: 118 additions & 0 deletions config/jobs/kubernetes/sig-aws/eks/k8s-aws-eks-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@

presets:
- env:
- name: AWSTESTER_EKS_TEST_MODE
value: "embedded"
- name: AWSTESTER_EKS_KUBERNETES_VERSION
value: "1.10"
- name: AWSTESTER_EKS_WAIT_BEFORE_DOWN
value: 1m0s
- name: AWSTESTER_EKS_DOWN
value: "true"
- name: AWSTESTER_EKS_ENABLE_WORKER_NODE_HA
value: "true"
- name: AWSTESTER_EKS_ENABLE_NODE_SSH
value: "true"
- name: AWSTESTER_EKS_ENABLE_LOG_ACCESS
value: "true"
- name: AWSTESTER_EKS_UPLOAD_TESTER_LOGS
value: "true"
- name: AWSTESTER_EKS_UPLOAD_WORKER_NODE_LOGS
value: "true"
- name: AWSTESTER_EKS_WORKER_NODE_INSTANCE_TYPE
value: m3.xlarge
- name: AWSTESTER_EKS_WORKER_NODE_ASG_MIN
value: "1"
- name: AWSTESTER_EKS_WORKER_NODE_ASG_MAX
value: "1"
- name: AWSTESTER_EKS_LOG_DEBUG
value: "false"
- name: AWSTESTER_EKS_LOG_ACCESS
value: "true"
- name: AWSTESTER_EKS_ALB_ENABLE
value: "false"
- name: AWS_SHARED_CREDENTIALS_FILE
value: /etc/eks-aws-credentials/eks-aws-credentials
labels:
preset-ci-kubernetes-e2e-aws-eks-1-10: "true"
volumeMounts:
- mountPath: /etc/eks-aws-credentials
name: eks-aws-credentials
readOnly: true
volumes:
- name: eks-aws-credentials
secret:
secretName: eks-aws-credentials

periodics:
# Run Kubernetes 1.10 branch e2e tests with EKS prod build 1.10
# similar to "pull-kubernetes-e2e-gke" but as a periodic job
- interval: 1h
name: ci-kubernetes-e2e-1-10-aws-eks-1-10-prod
labels:
preset-service-account: "true"
preset-ci-kubernetes-e2e-aws-eks-1-10: "true"
spec:
containers:
- image: 607362164682.dkr.ecr.us-west-2.amazonaws.com/awstester-e2e:20181029-8a9413d299e9
args:
- --timeout=200
- --bare
- --scenario=kubernetes_e2e
- --
- --check-leaked-resources
- --check-version-skew=false
- --deployment=eks
- --provider=eks
- --extract=ci/latest-1.10
- --ginkgo-parallel=30
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=180m

# Run Kubernetes e2e tests with EKS prod build 1.10
# similar to "pull-kubernetes-e2e-gke" but as a periodic job
- interval: 1h
name: ci-kubernetes-e2e-stable-aws-eks-1-10-prod
labels:
preset-service-account: "true"
preset-ci-kubernetes-e2e-aws-eks-1-10: "true"
spec:
containers:
- image: 607362164682.dkr.ecr.us-west-2.amazonaws.com/awstester-e2e:20181029-8a9413d299e9
args:
- --timeout=200
- --bare
- --scenario=kubernetes_e2e
- --
- --check-leaked-resources
- --check-version-skew=false
- --deployment=eks
- --provider=eks
- --extract=ci/k8s-stable1
- --ginkgo-parallel=30
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=180m

# Run Kubernetes e2e tests with EKS prod build 1.10
# similar to "pull-kubernetes-e2e-gke" but as a periodic job
- interval: 1h
name: ci-kubernetes-e2e-latest-aws-eks-1-10-prod
labels:
preset-service-account: "true"
preset-ci-kubernetes-e2e-aws-eks-1-10: "true"
spec:
containers:
- image: 607362164682.dkr.ecr.us-west-2.amazonaws.com/awstester-e2e:20181029-8a9413d299e9
args:
- --timeout=200
- --bare
- --scenario=kubernetes_e2e
- --
- --check-leaked-resources
- --check-version-skew=false
- --deployment=eks
- --provider=eks
- --extract=ci/latest
- --ginkgo-parallel=30
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=180m
2 changes: 1 addition & 1 deletion kubetest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func defineFlags() *options {
flag.BoolVar(&o.checkLeaks, "check-leaked-resources", false, "Ensure project ends with the same resources")
flag.StringVar(&o.cluster, "cluster", "", "Cluster name. Must be set for --deployment=gke (TODO: other deployments).")
flag.StringVar(&o.clusterIPRange, "cluster-ip-range", "", "Specifies CLUSTER_IP_RANGE value during --up and --test (only relevant for --deployment=bash). Auto-calculated if empty.")
flag.StringVar(&o.deployment, "deployment", "bash", "Choices: none/bash/conformance/dind/gke/kops/kubernetes-anywhere/node/local")
flag.StringVar(&o.deployment, "deployment", "bash", "Choices: none/bash/conformance/dind/gke/eks/kops/kubernetes-anywhere/node/local")
flag.StringVar(&o.dindImage, "dind-image", "", "The dind image to use to start a cluster. Defaults to the docker tag produced by bazel.")
flag.BoolVar(&o.down, "down", false, "If true, tear down the cluster before exiting.")
flag.StringVar(&o.dump, "dump", "", "If set, dump bring-up and cluster logs to this location on test or cluster-up failure")
Expand Down
27 changes: 27 additions & 0 deletions testgrid/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2157,6 +2157,14 @@ test_groups:
- name: periodic-kubernetes-e2e-packages-pushed
gcs_prefix: kubernetes-jenkins/logs/periodic-kubernetes-e2e-packages-pushed

# EKS e2e results
- name: ci-kubernetes-e2e-1-10-aws-eks-1-10-prod
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-1-10-aws-eks-1-10-prod
- name: ci-kubernetes-e2e-stable-aws-eks-1-10-prod
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-stable-aws-eks-1-10-prod
- name: ci-kubernetes-e2e-latest-aws-eks-1-10-prod
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-latest-aws-eks-1-10-prod

# charts tests
- name: ci-kubernetes-charts-gce
gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-charts-gce
Expand Down Expand Up @@ -5703,6 +5711,22 @@ dashboards:
test_group_name: pull-aws-ebs-csi-driver-sanity
description: "aws ebs csi driver sanity test"

- name: sig-aws-eks-ci-kubernetes-e2e-1-10
dashboard_tab:
- name: ci-kubernetes-e2e-1-10-aws-eks-1-10-prod
test_group_name: ci-kubernetes-e2e-1-10-aws-eks-1-10-prod
description: "Kubernetes 1.10 branch e2e tests with EKS prod build 1.10"
- name: sig-aws-eks-ci-kubernetes-e2e-stable
dashboard_tab:
- name: ci-kubernetes-e2e-stable-aws-eks-1-10-prod
test_group_name: ci-kubernetes-e2e-stable-aws-eks-1-10-prod
description: "Kubernetes stable branch e2e tests with EKS prod build 1.10"
- name: sig-aws-eks-ci-kubernetes-e2e-latest
dashboard_tab:
- name: ci-kubernetes-e2e-latest-aws-eks-1-10-prod
test_group_name: ci-kubernetes-e2e-latest-aws-eks-1-10-prod
description: "Kubernetes latest branch e2e tests with EKS prod build 1.10"

- name: sig-cli-master
dashboard_tab:
- name: gce
Expand Down Expand Up @@ -7426,6 +7450,9 @@ dashboard_groups:
- name: sig-aws
dashboard_names:
- sig-aws-ebs-csi-driver
- sig-aws-eks-ci-kubernetes-e2e-1-10
- sig-aws-eks-ci-kubernetes-e2e-stable
- sig-aws-eks-ci-kubernetes-e2e-latest

- name: sig-cli
dashboard_names:
Expand Down
15 changes: 0 additions & 15 deletions vendor/github.com/aws/awstester/eksconfig/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 27957ef

Please sign in to comment.