[avro] branch branch-1.9 updated: AVRO-2550: Update Travis CI scripts to use Yetus 0.10

[bl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

blachniet pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/branch-1.9 by this push:
     new 05d8e1a  AVRO-2550: Update Travis CI scripts to use Yetus 0.10
05d8e1a is described below

commit 05d8e1a869546dabdfb285085ec955c6c897c4f2
Author: Brian Lachniet <bl...@gmail.com>
AuthorDate: Tue Sep 17 20:53:00 2019 -0400

    AVRO-2550: Update Travis CI scripts to use Yetus 0.10
    
    Selectively cherry picked these changes from 9125e9ac
    
    (cherry picked from commit 9125e9acff342accbb404270c09fef4ccff151d6)
---
 .travis/before_install.sh | 8 +++++++-
 .travis/script.sh         | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index b091cc5..87982e2 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -23,7 +23,13 @@ case "$TRAVIS_OS_NAME" in
     sudo apt-get -q install --no-install-recommends -y curl git gnupg-agent locales pinentry-curses pkg-config rsync software-properties-common
     sudo apt-get -q clean
     sudo rm -rf /var/lib/apt/lists/*
-    curl -L https://www-us.apache.org/dist/yetus/0.8.0/yetus-0.8.0-bin.tar.gz | tar xvz -C /tmp/
+
+    # Only Yetus 0.9.0+ supports `ADD` and `COPY` commands in Dockerfile
+    curl -L https://www-us.apache.org/dist/yetus/0.10.0/apache-yetus-0.10.0-bin.tar.gz | tar xvz -C /tmp/
+    # A dirty workaround to disable the Yetus robot for TravisCI,
+    # since it'll cancel the changes that .travis/script.sh will do,
+    # even if the `--dirty-workspace` option is specified.
+    rm /tmp/apache-yetus-0.10.0/lib/precommit/robots.d/travisci.sh
     ;;
 "windows")
     choco install dotnetcore-sdk --version 2.2.300
diff --git a/.travis/script.sh b/.travis/script.sh
index adacc3d..00f1610 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -20,7 +20,10 @@ set -e
 case "$TRAVIS_OS_NAME" in
 "linux")
     sed -i.bak "s/openjdk:8/openjdk:${JAVA}/" share/docker/Dockerfile
-    /tmp/yetus-0.8.0/bin/test-patch --plugins=buildtest --java-home=/usr/local/openjdk-"${JAVA}" --user-plugins=share/precommit/ --run-tests --empty-patch --docker --dockerfile=share/docker/Dockerfile --dirty-workspace --verbose=true
+    # Workaround for Yetus. For now, Yetus assumes the directory in which Dockerfile is placed is the docker context.
+    # So the Dockerfile should be here to refer to other subdirectories than share/docker from inside the Dockerfile.
+    cp share/docker/Dockerfile .
+    /tmp/apache-yetus-0.10.0/bin/test-patch --plugins=buildtest --java-home=/usr/local/openjdk-"${JAVA}" --user-plugins=share/precommit/ --run-tests --empty-patch --docker --dockerfile=Dockerfile --dirty-workspace
     ;;
 "windows")
     ./lang/csharp/build.sh test