Delete LLVM 7 Kokoro configs
Also set the Subzero ones to use 10.0. This is only necessary so that
CMake is able to add the llvm-10.0 subdirectory, despite the target not
being built.
Bug: b/152339534
Change-Id: Ieacd6cff8559c07370a311a766e2d9a28f8dc73a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46749
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg
deleted file mode 100644
index 4a815b2..0000000
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg
deleted file mode 100644
index 4a815b2..0000000
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg
deleted file mode 100644
index a531867..0000000
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "RelWithDebInfo"
-}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg
deleted file mode 100644
index a531867..0000000
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "RelWithDebInfo"
-}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
index 7dcdf0b..2bba348 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
index 7dcdf0b..2bba348 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
index 31a9a84..900f17a 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
index 31a9a84..900f17a 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg
deleted file mode 100644
index afb708c..0000000
--- a/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg
deleted file mode 100644
index afb708c..0000000
--- a/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg
deleted file mode 100644
index da81a84..0000000
--- a/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "RelWithDebInfo"
-}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg
deleted file mode 100644
index da81a84..0000000
--- a/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "RelWithDebInfo"
-}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
index c620364..33abaa4 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
index c620364..33abaa4 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
index 16a78de..fada9fb 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
index 16a78de..fada9fb 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg b/tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg
deleted file mode 100644
index 107e32f..0000000
--- a/tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg b/tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg
deleted file mode 100644
index 107e32f..0000000
--- a/tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg b/tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg
deleted file mode 100644
index e39c5c1..0000000
--- a/tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "RelWithDebInfo"
-}
diff --git a/tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg b/tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg
deleted file mode 100644
index e39c5c1..0000000
--- a/tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "LLVM_VERSION"
- value: "7.0"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "RelWithDebInfo"
-}
diff --git a/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg b/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
index ff20925..fae2944 100644
--- a/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
index ff20925..fae2944 100644
--- a/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/macos/reactor_subzero/release/continuous.cfg b/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
index 057bc20..7b75774 100644
--- a/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
diff --git a/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg b/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
index 057bc20..7b75774 100644
--- a/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
@@ -10,7 +10,7 @@
env_vars {
key: "LLVM_VERSION"
- value: "7.0"
+ value: "10.0"
}
env_vars {
