Merge branch 'master' into rabbitmq-server-995

Author: michaelklishin

.travis.sh

@@ -1,34 +1,31 @@
 # vim:sw=2:et:
-sudo: false
-
-language: generic
 
+sudo: false
+language: erlang
+notifications:
+  email:
+    - [email protected]
 addons:
   apt:
+    sources:
+      - sourceline: deb https://packages.erlang-solutions.com/ubuntu trusty contrib
+        key_url: https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc
     packages:
-      - unixodbc
-      - unixodbc-dev
-      - libwxgtk2.8-dev
+      - awscli
+      # Use Elixir from Erlang Solutions. The provided Elixir is
+      # installed with kiex but is old. We also can't use kiex to
+      # install a newer one because of GitHub API rate limiting.
+      - elixir=1.4.5-1
+cache:
+  apt: true
+env:
+  global:
+    - secure: E4FIneR14YxnWbNNgFY48+Z8YpnwWcvIR0nD1Mo06WKXaq05UfQNQ7SZCjI3kKCNJGMhac12DFRhln+mQZ+T92MQ7IeU3ugpV5RSm+JqIwwIKzVM3+bjCQnFoL24OD4E+GjhJQWYQmPyM7l4OPluMr2N8BtANItgzX3AvljvlSc=
+    - secure: L1t0CHGR4RzOXwtkpM6feRKax95rszScBLqzjstEiMPkhjTsYTlAecnNxx6lTrGMnk5hQoi4PtbhmyZOX0siHTngTogoA/Nyn8etYzicU5ZO+qmBQOYpegz51lEu70ewXgkhEHzk9DtEPxfYviH9WiILrdUVRXXgZpoXq13p1QA=
 
 otp_release:
+  - "19.3"
   - "20.1"
- 
-services:
-  - docker
-
-env:
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=0
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=1
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=2
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=3
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=4
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=5
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=6
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=7
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=8
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=9
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=10
-  - OTP_TAG_NAME=OTP-20.1 TEST_SUITE=11
 
 before_script:
   # The checkout made by Travis is a "detached HEAD" and branches
@@ -42,26 +39,26 @@ before_script:
     git remote add upstream https://github.com/$TRAVIS_REPO_SLUG.git
     git fetch upstream stable:stable || :
     git fetch upstream master:master || :
-  # Install kerl; build gmake 4.2.1 and OTP
-  - $TRAVIS_BUILD_DIR/.travis.sh $OTP_TAG_NAME
-  - export PATH="$HOME/bin:$HOME/gmake/bin:$PATH"
-  - source "$HOME/otp/$OTP_TAG_NAME/activate"
-  - kerl active
-  - test -s "$HOME/.kiex/scripts/kiex" && source "$HOME/.kiex/scripts/kiex"
-  - test -x "$HOME/.kiex/elixirs/elixir-1.4.5/bin/elixir" || kiex install 1.4.5
-  - kiex use 1.4.5 --default
-  - mix local.hex --force
-  - make --version
+  # Make sure we use Elixir from Erlang Solutions and not kiex.
+  - |
+    echo YES | kiex implode
+    elixir --version
+    elixir --version | grep -q 'Elixir 1.4.5'
 
 script:
-  - $TRAVIS_BUILD_DIR/.travis.sh tests $TEST_SUITE
+  - make xref
+  - make ct-fast
 
-before_cache:
-  - $TRAVIS_BUILD_DIR/.travis.sh kiex_cleanup
+after_failure:
+  - |
+    cd "$TRAVIS_BUILD_DIR"
+    if test -d logs && test "$AWS_ACCESS_KEY_ID" && test "$AWS_SECRET_ACCESS_KEY"; then
+      archive_name="$(basename "$TRAVIS_REPO_SLUG")-$TRAVIS_JOB_NUMBER"
 
-cache:
-  directories:
-    - "$HOME/otp"
-    - "$HOME/.kiex"
-    - "$HOME/gmake"
-    - "$HOME/bin"
+      tar -c --transform "s/^logs/${archive_name}/" -f - logs | \
+        xz > "${archive_name}.tar.xz"
+
+      aws s3 cp "${archive_name}.tar.xz" s3://server-release-pipeline/travis-ci-logs/ \
+        --region eu-west-1 \
+        --acl public-read
+    fi

.travis.yml

@@ -0,0 +1,11 @@
+--- .travis.yml.orig	2017-11-08 14:23:22.036394000 +0100
++++ .travis.yml	2017-11-08 15:26:19.264520000 +0100
+@@ -37,7 +37,7 @@
+ 
+ script:
+   - make xref
+-  - make tests
++  - make ct-fast
+ 
+ after_failure:
+   - |