From 5a48669e90176a2043bfdee03931192e9ccb1d27 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 27 Sep 2018 18:22:31 +0200
Subject: [PATCH] Move etc/ci/taskcluster one level up

---
 .taskcluster.yml                                 | 2 +-
 etc/{ci => }/taskcluster/README.md               | 4 ++--
 etc/{ci => }/taskcluster/curl-artifact.sh        | 0
 etc/{ci => }/taskcluster/decision-task.py        | 4 ++--
 etc/{ci => }/taskcluster/decisionlib.py          | 0
 etc/{ci => }/taskcluster/docker/base.dockerfile  | 0
 etc/{ci => }/taskcluster/docker/build.dockerfile | 0
 etc/{ci => }/taskcluster/docker/run.dockerfile   | 0
 etc/{ci => }/taskcluster/mock.py                 | 0
 servo-tidy.toml                                  | 4 ++--
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename etc/{ci => }/taskcluster/README.md (98%)
 rename etc/{ci => }/taskcluster/curl-artifact.sh (100%)
 rename etc/{ci => }/taskcluster/decision-task.py (98%)
 rename etc/{ci => }/taskcluster/decisionlib.py (100%)
 rename etc/{ci => }/taskcluster/docker/base.dockerfile (100%)
 rename etc/{ci => }/taskcluster/docker/build.dockerfile (100%)
 rename etc/{ci => }/taskcluster/docker/run.dockerfile (100%)
 rename etc/{ci => }/taskcluster/mock.py (100%)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 5af791d6b8f..2749d11ada0 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -53,4 +53,4 @@ tasks:
               cd repo &&
               git fetch --depth 1 "$GIT_URL" "$GIT_REF" &&
               git reset --hard "$GIT_SHA" &&
-              python3 etc/ci/taskcluster/decision-task.py
+              python3 etc/taskcluster/decision-task.py
diff --git a/etc/ci/taskcluster/README.md b/etc/taskcluster/README.md
similarity index 98%
rename from etc/ci/taskcluster/README.md
rename to etc/taskcluster/README.md
index 83c21466734..d423020a54f 100644
--- a/etc/ci/taskcluster/README.md
+++ b/etc/taskcluster/README.md
@@ -40,7 +40,7 @@ to build an arbitrary [task graph].
 ## Servo’s decision task
 
 This repository’s [`.taskcluster.yml`][tc.yml] schedules a single task
-that runs the Python 3 script [`etc/ci/taskcluster/decision-task.py`](decision-task.py).
+that runs the Python 3 script [`etc/taskcluster/decision-task.py`](decision-task.py).
 It is called a *decision task* as it is responsible for deciding what other tasks to schedule.
 
 The Docker image that runs the decision task
@@ -73,7 +73,7 @@ when a `Dockerfile` first line is `% include` followed by a filename,
 that line is replaced with the content of that file.
 
 For example,
-[`etc/ci/taskcluster/docker/build.dockerfile`](docker/build.dockerfile) starts like so:
+[`etc/taskcluster/docker/build.dockerfile`](docker/build.dockerfile) starts like so:
 
 ```Dockerfile
 % include base.dockerfile
diff --git a/etc/ci/taskcluster/curl-artifact.sh b/etc/taskcluster/curl-artifact.sh
similarity index 100%
rename from etc/ci/taskcluster/curl-artifact.sh
rename to etc/taskcluster/curl-artifact.sh
diff --git a/etc/ci/taskcluster/decision-task.py b/etc/taskcluster/decision-task.py
similarity index 98%
rename from etc/ci/taskcluster/decision-task.py
rename to etc/taskcluster/decision-task.py
index 801ab31b6f2..ecd8da35f0b 100644
--- a/etc/ci/taskcluster/decision-task.py
+++ b/etc/taskcluster/decision-task.py
@@ -50,7 +50,7 @@ def linux_tidy_unit():
             ./mach package --dev
             ./mach test-tidy --no-progress --self-test
             python2.7 ./etc/memory_reports_over_time.py --test
-            python3 ./etc/ci/taskcluster/mock.py
+            python3 ./etc/taskcluster/mock.py
             ./etc/ci/lockfile_changed.sh
             ./etc/ci/check_no_panic.sh
         """,
@@ -145,7 +145,7 @@ def wpt_chunk(release_build_task, total_chunks, this_chunk, extra):
 
 def create_run_task(*, build_task, script, **kwargs):
     fetch_build = """
-        ./etc/ci/taskcluster/curl-artifact.sh ${BUILD_TASK_ID} target.tar.gz | tar -xz
+        ./etc/taskcluster/curl-artifact.sh ${BUILD_TASK_ID} target.tar.gz | tar -xz
     """
     kwargs.setdefault("env", {})["BUILD_TASK_ID"] = build_task
     kwargs.setdefault("dependencies", []).append(build_task)
diff --git a/etc/ci/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py
similarity index 100%
rename from etc/ci/taskcluster/decisionlib.py
rename to etc/taskcluster/decisionlib.py
diff --git a/etc/ci/taskcluster/docker/base.dockerfile b/etc/taskcluster/docker/base.dockerfile
similarity index 100%
rename from etc/ci/taskcluster/docker/base.dockerfile
rename to etc/taskcluster/docker/base.dockerfile
diff --git a/etc/ci/taskcluster/docker/build.dockerfile b/etc/taskcluster/docker/build.dockerfile
similarity index 100%
rename from etc/ci/taskcluster/docker/build.dockerfile
rename to etc/taskcluster/docker/build.dockerfile
diff --git a/etc/ci/taskcluster/docker/run.dockerfile b/etc/taskcluster/docker/run.dockerfile
similarity index 100%
rename from etc/ci/taskcluster/docker/run.dockerfile
rename to etc/taskcluster/docker/run.dockerfile
diff --git a/etc/ci/taskcluster/mock.py b/etc/taskcluster/mock.py
similarity index 100%
rename from etc/ci/taskcluster/mock.py
rename to etc/taskcluster/mock.py
diff --git a/servo-tidy.toml b/servo-tidy.toml
index e62ae92a06d..471bb629dcd 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -69,8 +69,8 @@ files = [
   "./tests/wpt/mozilla/tests/css/pre_with_tab.html",
   "./tests/wpt/mozilla/tests/mozilla/textarea_placeholder.html",
   # Python 3 syntax causes "E901 SyntaxError" when flake8 runs in Python 2
-  "./etc/ci/taskcluster/decision-task.py",
-  "./etc/ci/taskcluster/decisionlib.py",
+  "./etc/taskcluster/decision-task.py",
+  "./etc/taskcluster/decisionlib.py",
 ]
 # Directories that are ignored for the non-WPT tidy check.
 directories = [