From bf1a994d85679a6b6690778a851866de13fafd3f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 9 May 2017 11:52:20 -0400
Subject: [PATCH] =?UTF-8?q?ci:=20Move=20travis=20scripts=20from=20tests/?=
 =?UTF-8?q?=20=E2=86=92=20ci/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I think tests/ should be just that, ci/ is separate.  Also rename
the files to include "travis" since that's what we use them
for right now.

Closes: #843
Approved by: jlebon
---
 .travis.yml                                       | 4 ++--
 tests/ci-Dockerfile.in => ci/travis-Dockerfile.in | 4 ++--
 tests/ci-build.sh => ci/travis-build.sh           | 4 ++--
 tests/ci-install.sh => ci/travis-install.sh       | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/ci-Dockerfile.in => ci/travis-Dockerfile.in (75%)
 rename tests/ci-build.sh => ci/travis-build.sh (96%)
 rename tests/ci-install.sh => ci/travis-install.sh (95%)

diff --git a/.travis.yml b/.travis.yml
index a021592c..140e7ada 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ env:
   - ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial
 
 script:
-  - tests/ci-install.sh
-  - ci_parallel=2 ci_sudo=yes tests/ci-build.sh
+  - ci/travis-install.sh
+  - ci_parallel=2 ci_sudo=yes ci/travis-build.sh
 
 notifications:
   email: false
diff --git a/tests/ci-Dockerfile.in b/ci/travis-Dockerfile.in
similarity index 75%
rename from tests/ci-Dockerfile.in
rename to ci/travis-Dockerfile.in
index 0b56b431..df999e78 100644
--- a/tests/ci-Dockerfile.in
+++ b/ci/travis-Dockerfile.in
@@ -1,8 +1,8 @@
 FROM @ci_docker@
 ENV container docker
 
-ADD tests/ci-install.sh /ci-install.sh
-RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_in_docker=yes /ci-install.sh
+ADD ci/travis-install.sh /travis-install.sh
+RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_in_docker=yes /travis-install.sh
 
 ADD . /home/user/ostree
 RUN chown -R user:user /home/user/ostree
diff --git a/tests/ci-build.sh b/ci/travis-build.sh
similarity index 96%
rename from tests/ci-build.sh
rename to ci/travis-build.sh
index e310ed0f..885e3ce2 100755
--- a/tests/ci-build.sh
+++ b/ci/travis-build.sh
@@ -28,7 +28,7 @@ set -x
 NULL=
 
 # ci_docker:
-# If non-empty, this is the name of a Docker image. ci-install.sh will
+# If non-empty, this is the name of a Docker image. travis-install.sh will
 # fetch it with "docker pull" and use it as a base for a new Docker image
 # named "ci-image" in which we will do our testing.
 #
@@ -66,7 +66,7 @@ if [ -n "$ci_docker" ]; then
         --env=ci_configopts="${ci_configopts}" \
         --privileged \
         ci-image \
-        tests/ci-build.sh
+        ci/travis-build.sh
 fi
 
 maybe_fail_tests () {
diff --git a/tests/ci-install.sh b/ci/travis-install.sh
similarity index 95%
rename from tests/ci-install.sh
rename to ci/travis-install.sh
index d927d962..5d3d5a91 100755
--- a/tests/ci-install.sh
+++ b/ci/travis-install.sh
@@ -33,13 +33,13 @@ NULL=
 : "${ci_distro:=debian}"
 
 # ci_docker:
-# If non-empty, this is the name of a Docker image. ci-install.sh will
+# If non-empty, this is the name of a Docker image. travis-install.sh will
 # fetch it with "docker pull" and use it as a base for a new Docker image
 # named "ci-image" in which we will do our testing.
 : "${ci_docker:=}"
 
 # ci_in_docker:
-# Used internally by ci-install.sh. If yes, we are inside the Docker image
+# Used internally by travis-install.sh. If yes, we are inside the Docker image
 # (ci_docker is empty in this case).
 : "${ci_in_docker:=no}"
 
@@ -64,7 +64,7 @@ if [ -n "$ci_docker" ]; then
         -e "s/@ci_distro@/${ci_distro}/" \
         -e "s/@ci_docker@/${ci_docker}/" \
         -e "s/@ci_suite@/${ci_suite}/" \
-        < tests/ci-Dockerfile.in > Dockerfile
+        < ci/travis-Dockerfile.in > Dockerfile
     exec docker build -t ci-image .
 fi