From fc904aca8fd18928f5a3bd80abb7e26d0acf24d1 Mon Sep 17 00:00:00 2001
From: Dorinda Bassey <dbassey@redhat.com>
Date: Mon, 20 Oct 2025 14:08:17 +0200
Subject: [PATCH] Revert CROSVM_USE_SYSTEM_* build and CI changes

This setup is no longer needed since:
- The current build system and GPU backend
  integration have been restructured.
- CI now works with the virglrenderer crate.
- Environment variable overrides are no
  longer necessary to avoid CI failures.

Signed-off-by: Dorinda Bassey <dbassey@redhat.com>
---
 .buildkite/main-tests.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.buildkite/main-tests.json b/.buildkite/main-tests.json
index 8488c91..8dc87ad 100644
--- a/.buildkite/main-tests.json
+++ b/.buildkite/main-tests.json
@@ -2,7 +2,7 @@
   "tests": [
     {
       "test_name": "build-gnu",
-      "command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 RUSTFLAGS=\"-D warnings\" cargo build --release",
+      "command": "RUSTFLAGS=\"-D warnings\" cargo build --release",
       "platform": [
         "x86_64",
         "aarch64",
@@ -27,7 +27,7 @@
     },
     {
       "test_name": "unittests-gnu",
-      "command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 cargo test --all-features --workspace",
+      "command": "cargo test --all-features --workspace",
       "platform": [
         "x86_64",
         "aarch64",
@@ -50,7 +50,7 @@
     },
     {
       "test_name": "unittests-gnu-release",
-      "command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 cargo test --release --all-features --workspace",
+      "command": "cargo test --release --all-features --workspace",
       "platform": [
         "x86_64",
         "aarch64",
@@ -73,7 +73,7 @@
     },
     {
       "test_name": "clippy",
-      "command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 cargo clippy --workspace --bins --examples --benches --all-features --all-targets -- -D warnings -D clippy::undocumented_unsafe_blocks",
+      "command": "cargo clippy --workspace --bins --examples --benches --all-features --all-targets -- -D warnings -D clippy::undocumented_unsafe_blocks",
       "platform": [
         "x86_64",
         "aarch64",
@@ -82,7 +82,7 @@
     },
     {
       "test_name": "check-warnings",
-      "command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 RUSTFLAGS=\"-D warnings\" cargo check --all-targets --all-features --workspace",
+      "command": "RUSTFLAGS=\"-D warnings\" cargo check --all-targets --all-features --workspace",
       "platform": [
         "x86_64",
         "aarch64",
@@ -91,7 +91,7 @@
     },
     {
       "test_name": "coverage",
-      "command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 pytest $(find . -type f -name \"test_coverage.py\")",
+      "command": "pytest $(find . -type f -name \"test_coverage.py\")",
       "docker_plugin": {
         "privileged": true
       },