mirror of https://github.com/k3s-io/k3s
Merge pull request #18867 from spxtr/gke-ci
Add gke-ci and gke-ci-reboot to source controlpull/6/head
commit
2c75c29783
|
@ -239,7 +239,6 @@ E2E_OPT=${E2E_OPT:-""}
|
|||
# Set environment variables shared for all of the GCE Jenkins projects.
|
||||
if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then
|
||||
KUBERNETES_PROVIDER="gce"
|
||||
: ${GCE_SERVICE_ACCOUNT:=$(gcloud auth list 2> /dev/null | grep active | cut -f3 -d' ')}
|
||||
: ${E2E_MIN_STARTUP_PODS:="1"}
|
||||
: ${E2E_ZONE:="us-central1-f"}
|
||||
: ${NUM_NODES_PARALLEL:="6"} # Number of nodes required to run all of the tests in parallel
|
||||
|
@ -1112,7 +1111,7 @@ export KUBE_GCS_STAGING_PATH_SUFFIX=${KUBE_GCS_STAGING_PATH_SUFFIX:-}
|
|||
export KUBE_GCE_NODE_PROJECT=${KUBE_GCE_NODE_PROJECT:-}
|
||||
export KUBE_GCE_NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-}
|
||||
export KUBE_OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-}
|
||||
export GCE_SERVICE_ACCOUNT=${GCE_SERVICE_ACCOUNT:-}
|
||||
export GCE_SERVICE_ACCOUNT=$(gcloud auth list 2> /dev/null | grep active | cut -f3 -d' ')
|
||||
|
||||
# GKE variables
|
||||
export CLUSTER_NAME=${E2E_CLUSTER_NAME}
|
||||
|
|
|
@ -58,5 +58,25 @@
|
|||
- 'gce-slow':
|
||||
description: 'Run slow E2E tests on GCE using the latest successful build.'
|
||||
timeout: 270
|
||||
- 'gke-ci':
|
||||
description: |
|
||||
Run e2e tests using the following config:<br>
|
||||
- provider: GKE<br>
|
||||
- apiary: staging<br>
|
||||
- borg job: test<br>
|
||||
- client (kubectl): ci/latest.txt<br>
|
||||
- cluster (k8s): ci/latest.txt<br>
|
||||
- tests: ci/latest.txt
|
||||
timeout: 300
|
||||
- 'gke-ci-reboot:':
|
||||
description: |
|
||||
Run e2e tests using the following config:<br>
|
||||
- provider: GKE<br>
|
||||
- apiary: staging<br>
|
||||
- borg job: test<br>
|
||||
- client (kubectl): ci/latest.txt<br>
|
||||
- cluster (k8s): ci/latest.txt<br>
|
||||
- tests: ci/latest.txt
|
||||
timeout: 120
|
||||
jobs:
|
||||
- 'kubernetes-e2e-{suffix}'
|
||||
|
|
Loading…
Reference in New Issue