github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #46885 from kewu1992/test_gci_next_canary 

Automatic merge from submit-queue (batch tested with PRs 46885, 47197)

Let COS docker validation node test against gci-next-canary

**What this PR does / why we need it**:
This is for COS docker validation node test. We plan to use family gci-next-canary in container-vm-image-staging for future Docker upgration and validation.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47134

**Special notes for your reviewer**:

**Release note**:

```release-note
```
pull/6/head
Kubernetes Submit Queue 2017-06-08 15:46:41 -07:00 committed by GitHub
parent 502be9f906 cb28ed1f95
commit 3a96c31de5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/jenkins/docker_validation/cos-docker-validation.properties
View File

@ -1,5 +1,5 @@
GCI_IMAGE_PROJECT=cos-docker-validation GCI_IMAGE_PROJECT=container-vm-image-staging
GCI_IMAGE_FAMILY=validation-test GCI_IMAGE_FAMILY=gci-next-canary
GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)") GCI_IMAGE=$(gcloud compute images describe-from-family ${GCI_IMAGE_FAMILY} --project=${GCI_IMAGE_PROJECT} --format="value(name)")
GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml