diff options
-rw-r--r-- | .travis.yml | 27 | ||||
-rw-r--r-- | CONTRIBUTING.md | 6 | ||||
-rw-r--r-- | screwdriver.yaml | 9 | ||||
-rwxr-xr-x | screwdriver/build-vespa.sh (renamed from travis/travis-build.sh) | 2 | ||||
-rwxr-xr-x | screwdriver/detect-what-to-build.sh (renamed from travis/detect-what-to-build.sh) | 8 | ||||
-rwxr-xr-x | travis/travis.sh | 19 |
6 files changed, 9 insertions, 62 deletions
diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c1f970abad4..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -sudo: required - -services: - - docker - -cache: - timeout: 900 - directories: - - $HOME/.m2 - - $HOME/.ccache - -branches: - only: - - master - -before_cache: - - sudo rm -rf $HOME/.m2/repository/com/yahoo/vespa - - sudo rm -rf $HOME/.m2/repository/repository.xml - - du --summarize --human-readable $HOME/.m2/repository - - du --summarize --human-readable $HOME/.ccache - -install: true - -language: minimal - -script: ./travis/travis.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d5c611680dd..3a86f99d17c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ This documents tells you what you need to know to contribute. All work on Vespa happens directly on Github, using the [Github flow model](https://guides.github.com/introduction/flow/). We release the master branch a few times a week and you should expect it to almost always work. -In addition to the [public Travis build](https://travis-ci.org/vespa-engine/vespa) +In addition to the [public Screwdriver build](https://cd.screwdriver.cd/pipelines/6386) we have a large acceptance and performance test suite which is also run continuously. We plan to add this to the open source code base later. @@ -27,7 +27,7 @@ Please follow [best practices](https://github.com/trein/dev-best-practices/wiki/ When your code is ready to be submitted, [submit a pull request](https://help.github.com/articles/creating-a-pull-request/) to begin the code review process. -We only seek to accept code that you are authorized to contribute to the project. We have added a pull request template on our projects so that your contributions are made with the following confirmation: +We only seek to accept code that you are authorized to contribute to the project. We have added a pull request template on our projects so that your contributions are made with the following confirmation: > I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner. @@ -49,7 +49,7 @@ There is also a [ToDo list](TODO.md) for larger things which nobody are working If you have questions, want to share your experience or help others, please join our community on [Stack Overflow](http://stackoverflow.com/questions/tagged/vespa). ### Getting started -See [README](README.md) for how to build and test Vespa. +See [README](README.md) for how to build and test Vespa. For an overview of the modules, see [Code-map.md](Code-map.md). More details are in the READMEs of each module. diff --git a/screwdriver.yaml b/screwdriver.yaml index 3b492f82fa1..6753f312ab5 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -47,14 +47,7 @@ jobs: ccache -z - compile: | - export TRAVIS_REPO_SLUG="vespa-engine/vespa" - if [[ -z $SD_PULL_REQUEST ]]; then - export TRAVIS_PULL_REQUEST=false - else - export TRAVIS_PULL_REQUEST=$SD_PULL_REQUEST - fi - - travis/travis-build.sh + screwdriver/build-vespa.sh - save-cache: | if [[ -z "$SD_PULL_REQUEST" ]]; then diff --git a/travis/travis-build.sh b/screwdriver/build-vespa.sh index 9537118ae67..4480b33e6f9 100755 --- a/travis/travis-build.sh +++ b/screwdriver/build-vespa.sh @@ -17,7 +17,7 @@ ccache --max-size=1600M ccache --set-config=compression=true ccache -p -if ! source $SOURCE_DIR/travis/detect-what-to-build.sh; then +if ! source $SOURCE_DIR/screwdriver/detect-what-to-build.sh; then echo "Could not detect what to build." SHOULD_BUILD=all fi diff --git a/travis/detect-what-to-build.sh b/screwdriver/detect-what-to-build.sh index 47cb8ccfa00..1c4809f7295 100755 --- a/travis/detect-what-to-build.sh +++ b/screwdriver/detect-what-to-build.sh @@ -6,18 +6,18 @@ if (( ${#BASH_SOURCE[@]} == 1 )); then exit 1 fi -if [[ $TRAVIS_PULL_REQUEST == false ]]; then +if [[ -z $SD_PULL_REQUEST == false ]]; then export SHOULD_BUILD=all return 0 fi -JSON=$(curl -sLf https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST) +JSON=$(curl -sLf https://api.github.com/repos/vespa-engine/vespa/pulls/$SD_PULL_REQUEST) PR_TITLE=$(jq -re '.title' <<< "$JSON") -JSON=$(curl -sLf https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST/commits) +JSON=$(curl -sLf https://api.github.com/repos/vespa-engine/vespa/pulls/$SD_PULL_REQUEST/commits) COMMITS=$(jq -re '.[].sha' <<< "$JSON") -FILES=$(for C in $COMMITS; do JSON=$(curl -sLf https://api.github.com/repos/$TRAVIS_REPO_SLUG/commits/$C); jq -re '.files[].filename' <<< "$JSON"; done) +FILES=$(for C in $COMMITS; do JSON=$(curl -sLf https://api.github.com/repos/vespa-engine/vespa/commits/$C); jq -re '.files[].filename' <<< "$JSON"; done) if [[ $PR_TITLE =~ \[run-systemtest\] ]]; then SHOULD_BUILD=systemtest diff --git a/travis/travis.sh b/travis/travis.sh deleted file mode 100755 index 1ea4d43dd66..00000000000 --- a/travis/travis.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e - -# Workaround for Travis log output timeout (jobs without output over 10 minutes are killed) -function bell() { - while true; do - echo "." - sleep 300 - done -} - -DOCKER_IMAGE=vespaengine/vespa-build-centos7:latest - -bell & -docker run --rm -v ${HOME}/.m2:/root/.m2 -v ${HOME}/.ccache:/root/.ccache -v $(pwd):/source \ - -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \ - --entrypoint /source/travis/travis-build.sh ${DOCKER_IMAGE} -exit $? |