[PATCH i-g-t v3 1/5] intel-ci: rename i915 blocklists

[Kamil Konieczny]

Unify naming with Xe blocklists so blocklists for i915 will have
i915 prefix in names.

Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Reviewed-by: Karthik B S <karthik.b.s at intel.com>
---
 tests/intel-ci/README                                | 12 ++++++------
 ...st-pre-merge.txt => i915.blocklist-pre-merge.txt} |  5 +++--
 tests/intel-ci/{blacklist.txt => i915.blocklist.txt} |  0
 tests/intel-ci/meson.build                           |  4 ++--
 tests/intel/i915_test_config.json                    |  2 +-
 tests/intel/kms_test_config.json                     |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)
 rename tests/intel-ci/{blacklist-pre-merge.txt => i915.blocklist-pre-merge.txt} (97%)
 rename tests/intel-ci/{blacklist.txt => i915.blocklist.txt} (100%)

diff --git a/tests/intel-ci/README b/tests/intel-ci/README
index 07b32b54a..5ef2ee2d1 100644
--- a/tests/intel-ci/README
+++ b/tests/intel-ci/README
@@ -30,16 +30,16 @@ considered to mean that the kernel is not obviously broken.
 The results of CI runs on drm-tip and various other kernel trees can
 be found in https://intel-gfx-ci.01.org/CI/
 
-=============
-blacklist.txt
-=============
+==================
+i915.blocklist.txt
+==================
 
 This file contains regular expressions (one per line) for tests that
 are not to be executed in full suite test rounds.
 
-=======================
-blacklist-pre-merge.txt
-=======================
+============================
+i915.blocklist-pre-merge.txt
+============================
 
 This file contains regular expressions (one per line) for tests that
 are not to be executed in pre-merge full suite test rounds.
diff --git a/tests/intel-ci/blacklist-pre-merge.txt b/tests/intel-ci/i915.blocklist-pre-merge.txt
similarity index 97%
rename from tests/intel-ci/blacklist-pre-merge.txt
rename to tests/intel-ci/i915.blocklist-pre-merge.txt
index 0a1315aae..bee4a856f 100644
--- a/tests/intel-ci/blacklist-pre-merge.txt
+++ b/tests/intel-ci/i915.blocklist-pre-merge.txt
@@ -23,7 +23,7 @@ igt at kms_pm_rpm@universal-planes(-dpms)?
 # it is harder to predictably exercise the cache from userspace.
 #
 # Until these 8 tests are replaced with a kernel selftest and removed from IGT,
-# let's blacklist them for pre-merge testing as they are responsible for a
+# let's blocklist them for pre-merge testing as they are responsible for a
 # significant portion of our execution time:
 #
 # - shard-skl: 0.1% (~15 seconds)
@@ -96,7 +96,8 @@ igt at gem_tiled_wc
 # This test is doing nothing more than waiting for the driver to be suspended
 # before issueing a modeset. However, it never failed while testing for this
 # in the past year, so we probably just want to drop the amount of rounds to
-# reduce the runtime, but let's just blacklist it in pre-merge for now:
+# reduce the runtime, but let's just blocklist it in pre-merge for now:
+
 #
 # - shard-skl: 1% (~2.5 minute)
 # - shard-kbl: 0.9% (~1 minute)
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/i915.blocklist.txt
similarity index 100%
rename from tests/intel-ci/blacklist.txt
rename to tests/intel-ci/i915.blocklist.txt
diff --git a/tests/intel-ci/meson.build b/tests/intel-ci/meson.build
index 4aacb479d..d18170402 100644
--- a/tests/intel-ci/meson.build
+++ b/tests/intel-ci/meson.build
@@ -2,8 +2,8 @@
 
 intelci_files = [
   'README',
-  'blacklist.txt',
-  'blacklist-pre-merge.txt',
+  'i915.blocklist.txt',
+  'i915.blocklist-pre-merge.txt',
   'chamelium-only.testlist',
   'fast-feedback.testlist',
   'fast-feedback-chamelium-only.testlist',
diff --git a/tests/intel/i915_test_config.json b/tests/intel/i915_test_config.json
index e53f9400b..da871f493 100644
--- a/tests/intel/i915_test_config.json
+++ b/tests/intel/i915_test_config.json
@@ -28,7 +28,7 @@
                         { "i915 BAT": "../intel-ci/fast-feedback.testlist" }
                     ],
                     "exclude": [
-                        { "all": "../intel-ci/blacklist.txt" }
+                        { "all": "../intel-ci/i915.blocklist.txt" }
                     ]
                 },
                 "order": [
diff --git a/tests/intel/kms_test_config.json b/tests/intel/kms_test_config.json
index 0b6fc36e8..fc8766279 100644
--- a/tests/intel/kms_test_config.json
+++ b/tests/intel/kms_test_config.json
@@ -21,7 +21,7 @@
                         { "Xe BAT chamelium": "../intel-ci/xe-fast-feedback-chamelium-only.testlist" }
                     ],
                     "exclude": [
-                        { "i915 BAT, i915 BAT chamelium, i915 chamelium, i915 FULL": "../intel-ci/blacklist.txt" },
+                        { "i915 BAT, i915 BAT chamelium, i915 chamelium, i915 FULL": "../intel-ci/i915.blocklist.txt" },
                             { "Xe BAT, Xe BAT chamelium, Xe FULL": "../intel-ci/xe.blocklist.txt" }
                     ]
                 }
-- 
2.49.0