From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 1 Feb 2024 11:01:44 +0000 (+0000)
Subject: QUIC QLOG: Namespace the RUN_CI_TESTS variable
X-Git-Tag: openssl-3.3.0-alpha1~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1fe5738d393ace037c1f5f674125ad06a7e576d;p=thirdparty%2Fopenssl.git

QUIC QLOG: Namespace the RUN_CI_TESTS variable

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fdf76c77f8e..da6c7860abb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ permissions:
   contents: read
 
 env:
-  RUN_CI_TESTS: 1
+  OSSL_RUN_CI_TESTS: 1
 
 jobs:
   check_update:
diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 991bb4ff73f..1fbc3e708a8 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -12,7 +12,7 @@ permissions:
   contents: read
 
 env:
-  RUN_CI_TESTS: 1
+  OSSL_RUN_CI_TESTS: 1
 
 jobs:
   run-checker:
diff --git a/test/recipes/70-test_quic_multistream.t b/test/recipes/70-test_quic_multistream.t
index 4e72cef9567..2e662cd5c5c 100644
--- a/test/recipes/70-test_quic_multistream.t
+++ b/test/recipes/70-test_quic_multistream.t
@@ -18,7 +18,7 @@ plan skip_all => "QUIC protocol is not supported by this OpenSSL build"
 
 plan tests => 2;
 
-if (!disabled('qlog') && $ENV{RUN_CI_TESTS} == "1") {
+if (!disabled('qlog') && $ENV{OSSL_RUN_CI_TESTS} == "1") {
     my $qlog_output = result_dir("qlog-output");
     print "# Writing qlog output to $qlog_output\n";
     rmtree($qlog_output, { safe => 1 });
@@ -34,7 +34,7 @@ ok(run(test(["quic_multistream_test",
 
 SKIP: {
     skip "no qlog", 1 if disabled('qlog');
-    skip "not running CI tests", 1 if $ENV{RUN_CI_TESTS} != "1";
+    skip "not running CI tests", 1 if $ENV{OSSL_RUN_CI_TESTS} != "1";
 
     subtest "check qlog output" => sub {
         plan tests => 1;