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.

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

Add kubernetes-e2e-gce job to git #18454

Merged
merged 1 commit into from
Dec 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions hack/jenkins/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ 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
Expand Down Expand Up @@ -389,6 +390,7 @@ case ${JOB_NAME} in
# Runs all non-flaky, non-slow tests on GCE, sequentially.
kubernetes-e2e-gce)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e"}
: ${E2E_PUBLISH_GREEN_VERSION:="true"}
: ${E2E_NETWORK:="e2e-gce"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
Expand Down
47 changes: 47 additions & 0 deletions hack/jenkins/job-configs/global.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Mail Watcher Plugin alerts the specified address whenever a job config is updated or deleted.
- property:
name: mail-watcher
properties:
- raw:
xml: |
<org.jenkinsci.plugins.mailwatcher.WatcherJobProperty plugin="mail-watcher-plugin@1.13">
<watcherAddresses>cloud-kubernetes-team@google.com</watcherAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherJobProperty>

- publisher:
name: gcs-uploader
publishers:
- google-cloud-storage:
credentials-id: kubernetes-jenkins
uploads:
- build-log:
log-name: build-log.txt
storage-location: gs://kubernetes-jenkins/logs/$JOB_NAME/$BUILD_NUMBER
share-publicly: true
upload-for-failed-jobs: true

# Default log parser rules.
- publisher:
name: log-parser
publishers:
- logparser:
parse-rules: /jenkins-master-data/log_parser_rules.txt
unstable-on-warning: false
fail-on-error: false

# There is a junit JJB tag, but it doesn't handle the flaky-test-handler plugin.
- publisher:
name: junit-publisher
publishers:
- raw:
xml: |
<hudson.tasks.junit.JUnitResultArchiver plugin="junit@1.9">
<testResults>_artifacts/junit*.xml</testResults>
<keepLongStdio>true</keepLongStdio>
<testDataPublishers>
<de.esailors.jenkins.teststability.StabilityTestDataPublisher plugin="test-stability@1.0"/>
<com.google.jenkins.flakyTestHandler.plugin.JUnitFlakyTestDataPublisher plugin="flaky-test-handler@1.0.1"/>
<hudson.plugins.claim.ClaimTestDataPublisher plugin="claim@2.7"/>
</testDataPublishers>
<healthScaleFactor>100.0</healthScaleFactor>
</hudson.tasks.junit.JUnitResultArchiver>
21 changes: 3 additions & 18 deletions hack/jenkins/job-configs/kubernetes-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
builders:
- shell: './hack/jenkins/build.sh'
properties:
# Mail Watcher Plugin alerts the specified address whenever a job config is updated or deleted.
- raw:
xml: |
<org.jenkinsci.plugins.mailwatcher.WatcherJobProperty plugin="mail-watcher-plugin@1.13">
<watcherAddresses>cloud-kubernetes-team@google.com</watcherAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherJobProperty>
- mail-watcher
publishers:
- claim-build
- email-ext:
Expand All @@ -22,18 +17,8 @@
send-to:
- culprits
- recipients
- google-cloud-storage:
credentials-id: kubernetes-jenkins
uploads:
- build-log:
log-name: build-log.txt
storage-location: gs://kubernetes-jenkins/logs/$JOB_NAME/$BUILD_NUMBER
share-publicly: true
upload-for-failed-jobs: true
- logparser:
parse-rules: /jenkins-master-data/log_parser_rules.txt
unstable-on-warning: false
fail-on-error: false
- gcs-uploader
- log-parser
scm:
- git:
url: https://github.com/kubernetes/kubernetes
Expand Down
38 changes: 38 additions & 0 deletions hack/jenkins/job-configs/kubernetes-e2e.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
- job-template:
name: 'kubernetes-e2e-{suffix}'
description: 'Run E2E tests on GCE using the latest successful build. Test owner: Build Cop.'
logrotate:
daysToKeep: 7
builders:
- shell: |
curl -fsS -o upload-to-gcs.sh --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh" && source upload-to-gcs.sh; rm -f upload-to-gcs.sh
curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e.sh" | bash -
properties:
- mail-watcher
publishers:
- claim-build
- email-ext
- gcs-uploader
- log-parser
- junit-publisher
triggers:
- reverse:
jobs: kubernetes-build
result: success
- timed: 'H/30 * * * *'
wrappers:
- ansicolor:
colormap: xterm
- timeout:
timeout: 150
abort: true
fail: true
- timestamps
- workspace-cleanup

- project:
name: kubernetes-e2e
suffix:
- 'gce'
jobs:
- 'kubernetes-e2e-{suffix}'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- job:
name: kubernetes-update-jenkins-jobs
description: 'Update Jenkins jobs'
description: 'Update Jenkins jobs. Test owner: spxtr.'

triggers:
- timed: 'H/15 * * * *'
Expand Down