Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cluster e2e for cri-containerd. #5370

Merged
merged 1 commit into from
Nov 7, 2017
Merged

Add cluster e2e for cri-containerd. #5370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions jobs/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,45 @@
"sig-node"
]
},
"ci-cri-containerd-e2e-gci-gce": {
"args": [
"--check-leaked-resources",
"--env-file=jobs/platform/gce.env",
"--env-file=jobs/env/ci-cri-containerd-e2e-gce.env",
"--extract=ci/latest",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think after --extract cwd will become /workspace/kubernetes, before that it's inside the repo. Is this still correct?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--extract=ci/latest will hit https://github.com/kubernetes/test-infra/blob/master/kubetest/main.go#L368-L372

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you wanna merge and watch the actual behavior I'm also fine

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is extract=ci/latest required for e2e test?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok :-)

"--gcp-master-image=gci",
"--gcp-node-image=gci",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=30",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-node"
]
},
"ci-cri-containerd-e2e-ubuntu-gce": {
"args": [
"--check-leaked-resources",
"--env-file=jobs/platform/gce.env",
"--env-file=jobs/env/ci-cri-containerd-e2e-gce.env",
"--extract=ci/latest",
"--gcp-node-image=ubuntu",
"--gcp-zone=us-central1-f",
"--ginkgo-parallel=30",
"--image-family=ubuntu-gke-1604-lts",
"--image-project=ubuntu-os-gke-cloud",
"--provider=gce",
"--test_args=--ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\]|\\[Feature:.+\\] --minStartupPods=8",
"--timeout=50m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-node"
]
},
"ci-cri-containerd-node-e2e": {
"args": [
"--deployment=node",
Expand Down
20 changes: 20 additions & 0 deletions jobs/env/ci-cri-containerd-e2e-gce.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
### job-env
# This list should match the list in kubernetes-pull-build-test-e2e-gce.
NUM_NODES=4
# For now explicitly test etcd v2 mode in this suite.
STORAGE_BACKEND=etcd2
TEST_ETCD_IMAGE=2.2.1
TEST_ETCD_VERSION=2.2.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(do you still wanna test against old etcd?, up to you)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that all tests are still using this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah the e2e-gce uses this which I'm not sure why, anyway

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least ci-kubernetes-e2e-gci-gce.env is still using it.


# Enable the PodSecurityPolicy in tests.
ENABLE_POD_SECURITY_POLICY=true

# Envs for cri-containerd.
KUBE_MASTER_EXTRA_METADATA=user-data=/go/src/github.com/kubernetes-incubator/cri-containerd/test/e2e/master.yaml,cri-containerd-configure-sh=/go/src/github.com/kubernetes-incubator/cri-containerd/test/configure.sh
KUBE_NODE_EXTRA_METADATA=user-data=/go/src/github.com/kubernetes-incubator/cri-containerd/test/e2e/node.yaml,cri-containerd-configure-sh=/go/src/github.com/kubernetes-incubator/cri-containerd/test/configure.sh
KUBE_CONTAINER_RUNTIME=remote
KUBE_CONTAINER_RUNTIME_ENDPOINT=/var/run/cri-containerd.sock
KUBE_LOAD_IMAGE_COMMAND=/home/cri-containerd/usr/local/bin/cri-containerd load
NETWORK_POLICY_PROVIDER=calico
# TODO(random-liu): Enable this after kubernetes/kubernetes#55141 is fixed.
PREPULL_E2E_IMAGES=false
68 changes: 68 additions & 0 deletions prow/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3744,6 +3744,74 @@ periodics:
secret:
secretName: service-account

- interval: 1h
agent: kubernetes
name: ci-cri-containerd-e2e-gci-gce
spec:
containers:
- args:
- "--repo=github.com/kubernetes-incubator/cri-containerd=master"
- "--timeout=70"
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/service-account/service-account.json
- name: USER
value: prow
- name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE
value: /etc/ssh-key-secret/ssh-private
- name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE
value: /etc/ssh-key-secret/ssh-public
image: gcr.io/k8s-testimages/kubekins-e2e:v20171030-bcf1a6a2-master
volumeMounts:
- mountPath: /etc/service-account
name: service
readOnly: true
- mountPath: /etc/ssh-key-secret
name: ssh
readOnly: true
volumes:
- name: service
secret:
secretName: service-account
- name: ssh
secret:
defaultMode: 256
secretName: ssh-key-secret

- interval: 1h
agent: kubernetes
name: ci-cri-containerd-e2e-ubuntu-gce
spec:
containers:
- args:
- "--repo=github.com/kubernetes-incubator/cri-containerd=master"
- "--timeout=70"
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/service-account/service-account.json
- name: USER
value: prow
- name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE
value: /etc/ssh-key-secret/ssh-private
- name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE
value: /etc/ssh-key-secret/ssh-public
image: gcr.io/k8s-testimages/kubekins-e2e:v20171030-bcf1a6a2-master
volumeMounts:
- mountPath: /etc/service-account
name: service
readOnly: true
- mountPath: /etc/ssh-key-secret
name: ssh
readOnly: true
volumes:
- name: service
secret:
secretName: service-account
- name: ssh
secret:
defaultMode: 256
secretName: ssh-key-secret

- name: ci-cri-containerd-node-e2e
interval: 1h
agent: kubernetes
Expand Down
8 changes: 8 additions & 0 deletions testgrid/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ test_groups:
name_format: '%s [%s]'
- name: ci-cri-containerd-build
gcs_prefix: kubernetes-jenkins/logs/ci-cri-containerd-build
- name: ci-cri-containerd-e2e-gci-gce
gcs_prefix: kubernetes-jenkins/logs/ci-cri-containerd-e2e-gci-gce
- name: ci-cri-containerd-e2e-ubuntu-gce
gcs_prefix: kubernetes-jenkins/logs/ci-cri-containerd-e2e-ubuntu-gce
- name: ci-cri-containerd-node-e2e
gcs_prefix: kubernetes-jenkins/logs/ci-cri-containerd-node-e2e
test_name_config:
Expand Down Expand Up @@ -3355,6 +3359,10 @@ dashboards:
test_group_name: ci-cri-containerd-build
- name: node-e2e
test_group_name: ci-cri-containerd-node-e2e
- name: e2e-gci
test_group_name: ci-cri-containerd-e2e-gci-gce
- name: e2e-ubuntu
test_group_name: ci-cri-containerd-e2e-ubuntu-gce

- name: sig-node-rkt
dashboard_tab:
Expand Down