Use different server for yarn gpg key (#660)

Also move ./travis/ dir to ./scripts/travis/

Signed-off-by: Yuri Shkuro <ys@uber.com>

.travis.yml

@@ -39,17 +39,17 @@ env:
 install:
   - docker rmi $(docker images -q) || true
   - make install-ci
-  - if [ "$ALL_IN_ONE" == true ]; then bash ./travis/install-ui-deps.sh ; fi
-  - if [ "$DOCKER" == true ]; then bash ./travis/install-ui-deps.sh ; fi
-  - if [ "$CROSSDOCK" == true ]; then bash ./travis/install-crossdock-deps.sh ; fi
+  - if [ "$ALL_IN_ONE" == true ]; then bash ./scripts/travis/install-ui-deps.sh ; fi
+  - if [ "$DOCKER" == true ]; then bash ./scripts/travis/install-ui-deps.sh ; fi
+  - if [ "$CROSSDOCK" == true ]; then bash ./scripts/travis/install-crossdock-deps.sh ; fi
 
 script:
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
   - if [ "$TESTS" == true ]; then make test-ci ; else echo 'skipping tests'; fi
-  - if [ "$ALL_IN_ONE" == true ]; then bash ./travis/build-all-in-one-image.sh ; else echo 'skipping all_in_one'; fi
-  - if [ "$CROSSDOCK" == true ]; then bash ./travis/build-crossdock.sh ; else echo 'skipping crossdock'; fi
-  - if [ "$DOCKER" == true ]; then bash ./travis/build-docker-images.sh ; else echo 'skipping docker images'; fi
-  - if [ "$ES_INTEGRATION_TEST" == true ]; then bash ./travis/es-integration-test.sh ; else echo 'skipping elastic search integration test'; fi
+  - if [ "$ALL_IN_ONE" == true ]; then bash ./scripts/travis/build-all-in-one-image.sh ; else echo 'skipping all_in_one'; fi
+  - if [ "$CROSSDOCK" == true ]; then bash ./scripts/travis/build-crossdock.sh ; else echo 'skipping crossdock'; fi
+  - if [ "$DOCKER" == true ]; then bash ./scripts/travis/build-docker-images.sh ; else echo 'skipping docker images'; fi
+  - if [ "$ES_INTEGRATION_TEST" == true ]; then bash ./scripts/travis/es-integration-test.sh ; else echo 'skipping elastic search integration test'; fi
 
 after_success:
   - if [ "$COVERAGE" == true ]; then travis_retry goveralls -coverprofile=cover.out -service=travis-ci || true ; else echo 'skipping coverage'; fi

CONTRIBUTING.md

@@ -67,6 +67,7 @@ github.com/jaegertracing/jaeger
         dependencystore/
       elasticsearch/        - ES implementations of storage APIs
   scripts/                  - Miscellaneous project scripts, e.g. license update script
+    travis/                 - Travis scripts called in .travis.yml
   storage/
     spanstore/              - SpanReader / SpanWriter interfaces
     dependencystore/
@@ -75,7 +76,6 @@ github.com/jaegertracing/jaeger
     jaeger/
     sampling/
     zipkincore/
-  travis/                   - Travis scripts called in .travis.yml
   glide.yaml                - Glide is the project's dependency manager
   mkdocs.yml                - MkDocs builds the documentation in docs/
 ```

travis/build-all-in-one-image.sh → scripts/travis/build-all-in-one-image.sh

@@ -23,4 +23,4 @@ else
   exit 0
 fi
 
-bash ./travis/upload-to-docker.sh
+bash ./scripts/travis/upload-to-docker.sh

travis/build-crossdock.sh → scripts/travis/build-crossdock.sh

@@ -19,4 +19,4 @@ set -x
 # docker image has been build when running the crossdock
 export REPO=jaegertracing/test-driver
 docker tag $REPO:latest $REPO:$COMMIT
-bash ./travis/upload-to-docker.sh
+bash ./scripts/travis/upload-to-docker.sh

travis/build-docker-images.sh → scripts/travis/build-docker-images.sh

@@ -26,5 +26,5 @@ make docker
 for component in agent cassandra-schema collector query
 do
   export REPO="jaegertracing/jaeger-${component}"
-  bash ./travis/upload-to-docker.sh
+  bash ./scripts/travis/upload-to-docker.sh
 done

travis/install-ui-deps.sh → scripts/travis/install-ui-deps.sh

@@ -6,7 +6,7 @@ set -e
 curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
 
 # Repo for Yarn (https://yarnpkg.com/en/docs/install-ci#travis-tab)
-sudo apt-key adv --keyserver pgp.mit.edu --recv D101F7899D41F3C3
+sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
 echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
 sudo apt-get update -qq
 sudo apt-get install -y -qq yarn