From 592d0317c8450691ec962df3a10fc4abec58d056 Mon Sep 17 00:00:00 2001
From: Davide Gardenal <davide.gardenal@huawei.com>
Date: Fri, 1 Jul 2022 15:15:42 +0200
Subject: [PATCH] Revert ".oniro-ci: enable wic image debug mode for LAVA
 testing"

Enabling debug mode is not the ideal solution for running
tests because it's responsible for enlarging the rootfs size and causing
tests to fail. More detail reported in #673.

This reverts commit 3ddebb375705cc0bb6adb1076fb1dec8a96ad084.

Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com>
---
 .oniro-ci/build-generic.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index ecc34037..86834456 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -162,8 +162,6 @@
           | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' \
           | sort \
           | tee -a conf/local.conf )
-    # Print local conf for debugging.
-    - grep -E '^[^#]' conf/local.conf
 
     # Sanity check: disallow using public build cache with a specific setting
     # in local.conf. The list of settings may grow over time.
@@ -302,11 +300,6 @@
 .build-wic-image:
   extends: .build-image
   variables:
-    # cve-check is enabled in the .bitbake-workspace job. Append
-    # oniro-debug-linux for all wic image build jobs to enable root login which
-    # is required in LAVA test jobs. The variable can be overwritten in build
-    # job level for builds that require non-root user.
-    CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: "cve-check oniro-debug-linux"
     CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap"
   script:
     - !reference [.build-image, script]
-- 
GitLab