From 57b76eff4576794e92287199acd20b4d17038087 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Tue, 5 Apr 2016 01:31:01 +0200 Subject: [PATCH] Remove Shippable --- docs/devel/automation.md | 6 ++-- docs/devel/on-call-build-cop.md | 4 +-- shippable.yml | 57 --------------------------------- 3 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 shippable.yml diff --git a/docs/devel/automation.md b/docs/devel/automation.md index 918af37b57b..0d25fe3c6f3 100644 --- a/docs/devel/automation.md +++ b/docs/devel/automation.md @@ -67,7 +67,7 @@ The status of the submit-queue is [online.](http://submit-queue.k8s.io/) A PR is considered "ready for merging" if it matches the following: * it has the `lgtm` label, and that `lgtm` is newer than the latest commit * it has passed the cla pre-submit and has the `cla:yes` label - * it has passed the travis and shippable pre-submit tests + * it has passed the travis pre-submit tests * one (or all) of * its author is in kubernetes/contrib/submit-queue/whitelist.txt * its author is in contributors.txt via the github API. @@ -103,7 +103,7 @@ Currently this runs: * needs-rebase - Adds `needs-rebase` to PRs that aren't currently mergeable, and removes it from those that are. * size - Adds `size/xs` - `size/xxl` labels to PRs * ok-to-test - Adds the `ok-to-test` message to PRs that have an `lgtm` but the e2e-builder would otherwise not test due to whitelist - * ping-ci - Attempts to ping the ci systems (Travis/Shippable) if they are missing from a PR. + * ping-ci - Attempts to ping the ci systems (Travis) if they are missing from a PR. * lgtm-after-commit - Removes the `lgtm` label from PRs where there are commits that are newer than the `lgtm` label In the works: @@ -130,7 +130,7 @@ PR builder to re-run the tests. To do this, reply to the PR with a message that Right now you have to ask a contributor (this may be you!) to re-run the test with "@k8s-bot test this" -### How can I kick Shippable to re-test on a failure? +### How can I kick Travis to re-test on a failure? Right now the easiest way is to close and then immediately re-open the PR. diff --git a/docs/devel/on-call-build-cop.md b/docs/devel/on-call-build-cop.md index bb4b513c475..32660b2b307 100644 --- a/docs/devel/on-call-build-cop.md +++ b/docs/devel/on-call-build-cop.md @@ -87,9 +87,9 @@ Build-copping * Jobs that are not in [critical e2e tests] (https://goto.google.com/k8s-test/view/Critical%20Builds/) or [flaky test builds](https://goto.google.com/k8s-test/view/Flaky/) are not your responsibility to monitor. The `Test owner:` in the job description will be automatically emailed if the job is failing. * If you are a weekday oncall, ensure that PRs confirming to the following pre-requisites are being merged at a reasonable rate: * [Have been LGTMd](https://github.com/kubernetes/kubernetes/labels/lgtm) - * Pass Travis and Shippable. + * Pass Travis and Jenkins per-PR tests. * Author has signed CLA if applicable. -* If you are a weekend oncall, [never merge PRs manually](collab.md), instead add the label "lgtm" to the PRs once they have been LGTMd and passed Travis and Shippable; this will cause merge-bot to merge them automatically (or make them easy to find by the next oncall, who will merge them). +* If you are a weekend oncall, [never merge PRs manually](collab.md), instead add the label "lgtm" to the PRs once they have been LGTMd and passed Travis; this will cause merge-bot to merge them automatically (or make them easy to find by the next oncall, who will merge them). * When the build is broken, roll back the PRs responsible ASAP * When E2E tests are unstable, a "merge freeze" may be instituted. During a merge freeze: * Oncall should slowly merge LGTMd changes throughout the day while monitoring E2E to ensure stability. diff --git a/shippable.yml b/shippable.yml deleted file mode 100644 index 770a81e9714..00000000000 --- a/shippable.yml +++ /dev/null @@ -1,57 +0,0 @@ -sudo: false - -language: go - -matrix: - include: - - go: 1.6.0 - env: - - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=registry - - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults" - - CI_NAME="shippable" - - CI_BUILD_NUMBER="$BUILD_NUMBER" - - CI_BUILD_URL="$BUILD_URL" - - CI_BRANCH="$BRANCH" - - CI_PULL_REQUEST="$PULL_REQUEST" - # Set COVERALLS_REPO_TOKEN - - secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w== - - go: 1.4 - env: - - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=kubernetes.io/registry - - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults" - - CI_NAME="shippable" - - CI_BUILD_NUMBER="$BUILD_NUMBER" - - CI_BUILD_URL="$BUILD_URL" - - CI_BRANCH="$BRANCH" - - CI_PULL_REQUEST="$PULL_REQUEST" - # Set COVERALLS_REPO_TOKEN - - secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w== - -before_install: - - curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/cf746e6308ba2ff8def44bc5eddc107257139349/gimme; chmod +x /usr/local/bin/gimme - - gimme $SHIPPABLE_GO_VERSION - - source ~/.gimme/envs/go$SHIPPABLE_GO_VERSION.env - - ./hack/install-etcd.sh - - export GOPATH=$SHIPPABLE_GOPATH - - mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/kubernetes/kubernetes /root/workspace/src/k8s.io/kubernetes - - export PATH=$GOPATH/bin:./third_party/etcd:$PATH - -install: - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls - - go get github.com/tools/godep - - go get github.com/jstemmer/go-junit-report - - ./hack/build-go.sh - - godep go install ./... - - ./hack/install-etcd.sh - - make verify BRANCH=${BASE_BRANCH} - -script: - # Disable coverage collection on pull requests - - KUBE_RACE="-race" KUBE_COVER=$([[ "$PULL_REQUEST" =~ ^[0-9]+$ ]] && echo "n" || echo "y") KUBE_GOVERALLS_BIN="$GOPATH/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_ETCD_PREFIXES="${KUBE_TEST_ETCD_PREFIXES}" KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" ./hack/test-go.sh -- -p=2 - - ./hack/test-cmd.sh - - KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh - - ./hack/test-update-storage-objects.sh - -notifications: - irc: "chat.freenode.net#kubernetes-dev"