From 06f075976e9d6c98b5887472c93217efe6325828 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Tue, 2 Jul 2019 12:57:24 +0200
Subject: [PATCH] btrfs-progs: ci: rename travis/ to ci/

Rename the directory for continuous integration scripts to a more
generic name as we're going to use more than one. The base image on
travis has an old kernel. It's not possible to use a newer one and some
tests fail making the coverage unreliable.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 .travis.yml                                   | 22 +++++++++----------
 {travis => ci}/build-default                  |  0
 {travis => ci}/build-dep-reiserfs             |  0
 {travis => ci}/build-dep-zstd                 |  0
 .../images/ci-musl-x86_64/Dockerfile          |  0
 {travis => ci}/images/test-build              |  2 +-
 {travis => ci}/should-run-test                |  0
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename {travis => ci}/build-default (100%)
 rename {travis => ci}/build-dep-reiserfs (100%)
 rename {travis => ci}/build-dep-zstd (100%)
 rename {travis => ci}/images/ci-musl-x86_64/Dockerfile (100%)
 rename {travis => ci}/images/test-build (92%)
 rename {travis => ci}/should-run-test (100%)

diff --git a/.travis.yml b/.travis.yml
index 553554cc..d2f39307 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,9 +56,9 @@ before_install:
   - sudo apt-get install -qq e2fslibs-dev gcc libacl1-dev libblkid-dev liblzo2-dev make pkg-config udev zlib1g-dev acl attr reiserfsprogs python3-setuptools
   - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
   - docker pull kdave/ci-musl-x86_64
-  - travis/build-dep-reiserfs
-  - travis/build-dep-zstd
-  - travis/build-default --disable-documentation --with-convert=ext2,reiserfs
+  - ci/build-dep-reiserfs
+  - ci/build-dep-zstd
+  - ci/build-default --disable-documentation --with-convert=ext2,reiserfs
 
 addons:
   coverity_scan:
@@ -72,14 +72,14 @@ addons:
 
 script:
   # quick build tests
-  - "if travis/should-run-test; then docker run -it --env CC=$CC kdave/ci-musl-x86_64 ./test-build $TRAVIS_BRANCH --disable-documentation --disable-backtrace; fi"
-  - "if travis/should-run-test; then make TEST_LOG=dump library-test; fi"
+  - "if ci/should-run-test; then docker run -it --env CC=$CC kdave/ci-musl-x86_64 ./test-build $TRAVIS_BRANCH --disable-documentation --disable-backtrace; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump library-test; fi"
   # real tests
-  - "if travis/should-run-test; then make TEST_LOG=dump test-cli; fi"
-  - "if travis/should-run-test; then make TEST_LOG=dump test-mkfs; fi"
-  - "if travis/should-run-test; then make TEST_LOG=dump test-check; fi"
-  - "if travis/should-run-test; then make TEST_LOG=dump TEST_ENABLE_OVERRIDE=true TEST_ARGS_CHECK=--mode=lowmem test-check; fi"
-  - "if travis/should-run-test; then make TEST_LOG=dump test-misc; fi"
-  - "if travis/should-run-test; then make TEST_LOG=dump test-fuzz; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump test-cli; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump test-mkfs; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump test-check; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump TEST_ENABLE_OVERRIDE=true TEST_ARGS_CHECK=--mode=lowmem test-check; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump test-misc; fi"
+  - "if ci/should-run-test; then make TEST_LOG=dump test-fuzz; fi"
   # long running tests
   - "if [ $TRAVIS_BRANCH = release-test ]; then make TEST_LOG=dump test-convert; fi"
diff --git a/travis/build-default b/ci/build-default
similarity index 100%
rename from travis/build-default
rename to ci/build-default
diff --git a/travis/build-dep-reiserfs b/ci/build-dep-reiserfs
similarity index 100%
rename from travis/build-dep-reiserfs
rename to ci/build-dep-reiserfs
diff --git a/travis/build-dep-zstd b/ci/build-dep-zstd
similarity index 100%
rename from travis/build-dep-zstd
rename to ci/build-dep-zstd
diff --git a/travis/images/ci-musl-x86_64/Dockerfile b/ci/images/ci-musl-x86_64/Dockerfile
similarity index 100%
rename from travis/images/ci-musl-x86_64/Dockerfile
rename to ci/images/ci-musl-x86_64/Dockerfile
diff --git a/travis/images/test-build b/ci/images/test-build
similarity index 92%
rename from travis/images/test-build
rename to ci/images/test-build
index 2f05fbf5..330e75ae 100755
--- a/travis/images/test-build
+++ b/ci/images/test-build
@@ -12,4 +12,4 @@ cd /tmp
 wget "$url" -O ${branch}.tar.gz
 tar xf ${branch}.tar.gz
 cd btrfs-progs-${branch}
-travis/build-default "$@"
+ci/build-default "$@"
diff --git a/travis/should-run-test b/ci/should-run-test
similarity index 100%
rename from travis/should-run-test
rename to ci/should-run-test