[Rename] Environment variables in entire repository. (#405)

Rename all environment variables with prefix 'ES_' to 'OPENSEARCH_'. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
opensearch-project · Mar 20, 2021 · 88398d8 · 88398d8
1 parent cb9fdcd
commit 88398d8
Show file tree

Hide file tree

Showing 23 changed files with 62 additions and 62 deletions.
diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties
@@ -4,7 +4,7 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=openjdk14
-ES_RUNTIME_JAVA=java8
+OPENSEARCH_BUILD_JAVA=openjdk14
+OPENSEARCH_RUNTIME_JAVA=java8
 GRADLE_TASK=build
 GRADLE_EXTRA_ARGS=
diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml
@@ -5,7 +5,7 @@
 # which Elasticsearch will be tested.  Valid Java versions are 'java'
 # or 'openjdk' followed by the major release number.
 
-ES_RUNTIME_JAVA:
+OPENSEARCH_RUNTIME_JAVA:
   - java8
   - java11
   - openjdk14

diff --git a/.ci/os.ps1 b/.ci/os.ps1
@@ -8,8 +8,8 @@ If (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent
 }
 
 $AppProps = ConvertFrom-StringData (Get-Content .ci/java-versions.properties -raw)
-$env:ES_BUILD_JAVA=$AppProps.ES_BUILD_JAVA
-$env:ES_RUNTIME_JAVA=$AppProps.ES_RUNTIME_JAVA
+$env:OPENSEARCH_BUILD_JAVA=$AppProps.OPENSEARCH_BUILD_JAVA
+$env:OPENSEARCH_RUNTIME_JAVA=$AppProps.OPENSEARCH_RUNTIME_JAVA
 
 $ErrorActionPreference="Stop"
 $gradleInit = "C:\Users\$env:username\.gradle\init.d\"
@@ -20,9 +20,9 @@ echo "Copy .ci/init.gradle to $gradleInit"
 Copy-Item .ci/init.gradle -Destination $gradleInit
 
 [Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
-$env:PATH="C:\Users\jenkins\.java\$env:ES_BUILD_JAVA\bin\;$env:PATH"
+$env:PATH="C:\Users\jenkins\.java\$env:OPENSEARCH_BUILD_JAVA\bin\;$env:PATH"
 $env:JAVA_HOME=$null
-$env:SYSTEM_JAVA_HOME="C:\Users\jenkins\.java\$env:ES_RUNTIME_JAVA"
+$env:SYSTEM_JAVA_HOME="C:\Users\jenkins\.java\$env:OPENSEARCH_RUNTIME_JAVA"
 Remove-Item -Recurse -Force \tmp -ErrorAction Ignore
 New-Item -ItemType directory -Path \tmp
 

diff --git a/.ci/os.sh b/.ci/os.sh
@@ -23,8 +23,8 @@ sudo useradd vagrant
 set -e
 
 . .ci/java-versions.properties
-RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
-BUILD_JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
+RUNTIME_JAVA_HOME=$HOME/.java/$OPENSEARCH_RUNTIME_JAVA
+BUILD_JAVA_HOME=$HOME/.java/$OPENSEARCH_BUILD_JAVA
 
 rm -Rfv $HOME/.gradle/init.d/ && mkdir -p $HOME/.gradle/init.d
 cp -v .ci/init.gradle $HOME/.gradle/init.d

diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
@@ -16,7 +16,7 @@ while [ -h "$SCRIPT" ] ; do
 done
 
 source $(dirname "${SCRIPT}")/java-versions.properties
-export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
+export JAVA_HOME="${HOME}"/.java/${OPENSEARCH_BUILD_JAVA}
 # We are caching BWC versions too, need these so we can build those
 export JAVA8_HOME="${HOME}"/.java/java8
 export JAVA11_HOME="${HOME}"/.java/java11

diff --git a/...est/resources/org/opensearch/gradle/internal/fake_git/remote/.ci/java-versions.properties b/...est/resources/org/opensearch/gradle/internal/fake_git/remote/.ci/java-versions.properties
@@ -16,6 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-ES_BUILD_JAVA=openjdk14
-ES_RUNTIME_JAVA=openjdk14
+OPENSEARCH_BUILD_JAVA=openjdk14
+OPENSEARCH_RUNTIME_JAVA=openjdk14
 GRADLE_TASK=build
diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/test/ClusterFormationTasks.groovy
@@ -758,24 +758,24 @@ class ClusterFormationTasks {
             }
 
             // Configure ES JAVA OPTS - adds system properties, assertion flags, remote debug etc
-            List<String> esJavaOpts = [node.env.get('ES_JAVA_OPTS', '')]
+            List<String> opensearchJavaOpts = [node.env.get('OPENSEARCH_JAVA_OPTS', '')]
             String collectedSystemProperties = node.config.systemProperties.collect { key, value -> "-D${key}=${value}" }.join(" ")
-            esJavaOpts.add(collectedSystemProperties)
-            esJavaOpts.add(node.config.jvmArgs)
+            opensearchJavaOpts.add(collectedSystemProperties)
+            opensearchJavaOpts.add(node.config.jvmArgs)
             if (Boolean.parseBoolean(System.getProperty('tests.asserts', 'true'))) {
                 // put the enable assertions options before other options to allow
                 // flexibility to disable assertions for specific packages or classes
                 // in the cluster-specific options
-                esJavaOpts.add("-ea")
-                esJavaOpts.add("-esa")
+                opensearchJavaOpts.add("-ea")
+                opensearchJavaOpts.add("-esa")
             }
             // we must add debug options inside the closure so the config is read at execution time, as
             // gradle task options are not processed until the end of the configuration phase
             if (node.config.debug) {
                 println 'Running opensearch in debug mode, suspending until connected on port 8000'
-                esJavaOpts.add('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000')
+                opensearchJavaOpts.add('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000')
             }
-            node.env['ES_JAVA_OPTS'] = esJavaOpts.join(" ")
+            node.env['OPENSEARCH_JAVA_OPTS'] = opensearchJavaOpts.join(" ")
 
             //
             project.logger.info("Starting node in ${node.clusterName} distribution: ${node.config.distribution}")

diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/test/NodeInfo.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/test/NodeInfo.groovy
@@ -197,10 +197,10 @@ class NodeInfo {
              * We have to delay building the string as the path will not exist during configuration which will fail on Windows due to
              * getting the short name requiring the path to already exist.
              */
-            env.put('ES_PATH_CONF', "${-> getShortPathName(pathConf.toString())}")
+            env.put('OPENSEARCH_PATH_CONF', "${-> getShortPathName(pathConf.toString())}")
         }
         else {
-            env.put('ES_PATH_CONF', pathConf)
+            env.put('OPENSEARCH_PATH_CONF', pathConf)
         }
         if (!System.properties.containsKey("tests.opensearch.path.data")) {
             if (Os.isFamily(Os.FAMILY_WINDOWS)) {

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/internal/BwcSetupExtension.java b/buildSrc/src/main/java/org/opensearch/gradle/internal/BwcSetupExtension.java
@@ -81,9 +81,9 @@ private TaskProvider<LoggedExec> createRunBwcGradleTask(Project project, String
                         Integer.parseInt(
                             Arrays.asList(javaVersionsString.split("\n"))
                                 .stream()
-                                .filter(l -> l.trim().startsWith("ES_BUILD_JAVA="))
-                                .map(l -> l.replace("ES_BUILD_JAVA=java", "").trim())
-                                .map(l -> l.replace("ES_BUILD_JAVA=openjdk", "").trim())
+                                .filter(l -> l.trim().startsWith("OPENSEARCH_BUILD_JAVA="))
+                                .map(l -> l.replace("OPENSEARCH_BUILD_JAVA=java", "").trim())
+                                .map(l -> l.replace("OPENSEARCH_BUILD_JAVA=openjdk", "").trim())
                                 .collect(Collectors.joining("!!"))
                         )
                     )
@@ -94,9 +94,9 @@ private TaskProvider<LoggedExec> createRunBwcGradleTask(Project project, String
                         Integer.parseInt(
                             Arrays.asList(javaVersionsString.split("\n"))
                                 .stream()
-                                .filter(l -> l.trim().startsWith("ES_RUNTIME_JAVA="))
-                                .map(l -> l.replace("ES_RUNTIME_JAVA=java", "").trim())
-                                .map(l -> l.replace("ES_RUNTIME_JAVA=openjdk", "").trim())
+                                .filter(l -> l.trim().startsWith("OPENSEARCH_RUNTIME_JAVA="))
+                                .map(l -> l.replace("OPENSEARCH_RUNTIME_JAVA=java", "").trim())
+                                .map(l -> l.replace("OPENSEARCH_RUNTIME_JAVA=openjdk", "").trim())
                                 .collect(Collectors.joining("!!"))
                         )
                     )

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java
@@ -729,17 +729,17 @@ private void runOpenSearchBinScript(String tool, CharSequence... args) {
     private Map<String, String> getESEnvironment() {
         Map<String, String> defaultEnv = new HashMap<>();
         getRequiredJavaHome().ifPresent(javaHome -> defaultEnv.put("JAVA_HOME", javaHome));
-        defaultEnv.put("ES_PATH_CONF", configFile.getParent().toString());
+        defaultEnv.put("OPENSEARCH_PATH_CONF", configFile.getParent().toString());
         String systemPropertiesString = "";
         if (systemProperties.isEmpty() == false) {
             systemPropertiesString = " "
                 + systemProperties.entrySet()
                     .stream()
                     .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue())
-                    // ES_PATH_CONF is also set as an environment variable and for a reference to ${ES_PATH_CONF}
-                    // to work ES_JAVA_OPTS, we need to make sure that ES_PATH_CONF before ES_JAVA_OPTS. Instead,
+                    // OPENSEARCH_PATH_CONF is also set as an environment variable and for a reference to ${OPENSEARCH_PATH_CONF}
+                    // to work OPENSEARCH_JAVA_OPTS, we need to make sure that OPENSEARCH_PATH_CONF before OPENSEARCH_JAVA_OPTS. Instead,
                     // we replace the reference with the actual value in other environment variables
-                    .map(p -> p.replace("${ES_PATH_CONF}", configFile.getParent().toString()))
+                    .map(p -> p.replace("${OPENSEARCH_PATH_CONF}", configFile.getParent().toString()))
                     .collect(Collectors.joining(" "));
         }
         String jvmArgsString = "";
@@ -754,13 +754,13 @@ private Map<String, String> getESEnvironment() {
         }
         String heapSize = System.getProperty("tests.heap.size", "512m");
         defaultEnv.put(
-            "ES_JAVA_OPTS",
+            "OPENSEARCH_JAVA_OPTS",
             "-Xms" + heapSize + " -Xmx" + heapSize + " -ea -esa " + systemPropertiesString + " " + jvmArgsString + " " +
             // Support passing in additional JVM arguments
                 System.getProperty("tests.jvm.argline", "")
         );
-        defaultEnv.put("ES_TMPDIR", tmpDir.toString());
-        // Windows requires this as it defaults to `c:\windows` despite ES_TMPDIR
+        defaultEnv.put("OPENSEARCH_TMPDIR", tmpDir.toString());
+        // Windows requires this as it defaults to `c:\windows` despite OPENSEARCH_TMPDIR
         defaultEnv.put("TMP", tmpDir.toString());
 
         // Override the system hostname variables for testing

diff --git a/modules/reindex/src/test/resources/org/opensearch/index/reindex/README.txt b/modules/reindex/src/test/resources/org/opensearch/index/reindex/README.txt
@@ -1,14 +1,14 @@
 # ca.p12
 
-$ES_HOME/bin/elasticsearch-certutil ca --out ca.p12 --pass "ca-password" --days 9999
+$OPENSEARCH_HOME/bin/elasticsearch-certutil ca --out ca.p12 --pass "ca-password" --days 9999
 
 # ca.pem
 
 openssl pkcs12 -info -in ./ca.p12 -nokeys -out ca.pem -passin "pass:ca-password"
 
 # http.p12
 
-$ES_HOME/bin/elasticsearch-certutil cert --out http.zip --pass "http-password" \
+$OPENSEARCH_HOME/bin/elasticsearch-certutil cert --out http.zip --pass "http-password" \
     --days 9999 --pem --name "http" \
     --ca ca.p12 --ca-pass "ca-password" \
     --dns=localhost --dns=localhost.localdomain --dns=localhost4 --dns=localhost4.localdomain4 --dns=localhost6 --dns=localhost6.localdomain6 \
@@ -18,7 +18,7 @@ rm http.zip
 
 # client.p12
 
-$ES_HOME/bin/elasticsearch-certutil cert --out client.zip --pass "client-password" \
+$OPENSEARCH_HOME/bin/elasticsearch-certutil cert --out client.zip --pass "client-password" \
     --name "client" --days 9999  --pem \
     --ca ca.p12 --ca-pass "ca-password"
 unzip client.zip

diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java
@@ -55,7 +55,7 @@ final boolean isEnabled() {
 
     @SuppressWarnings("unused")
     public SystemdPlugin() {
-        this(true, Build.CURRENT.type(), System.getenv("ES_SD_NOTIFY"));
+        this(true, Build.CURRENT.type(), System.getenv("OPENSEARCH_SD_NOTIFY"));
     }
 
     SystemdPlugin(final boolean assertIsPackageDistribution, final Build.Type buildType, final String esSDNotify) {
@@ -69,13 +69,13 @@ public SystemdPlugin() {
             enabled = false;
             return;
         }
-        logger.trace("ES_SD_NOTIFY is set to [{}]", esSDNotify);
+        logger.trace("OPENSEARCH_SD_NOTIFY is set to [{}]", esSDNotify);
         if (esSDNotify == null) {
             enabled = false;
             return;
         }
         if (Boolean.TRUE.toString().equals(esSDNotify) == false && Boolean.FALSE.toString().equals(esSDNotify) == false) {
-            throw new RuntimeException("ES_SD_NOTIFY set to unexpected value [" + esSDNotify + "]");
+            throw new RuntimeException("OPENSEARCH_SD_NOTIFY set to unexpected value [" + esSDNotify + "]");
         }
         enabled = Boolean.TRUE.toString().equals(esSDNotify);
     }

diff --git a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java
@@ -93,7 +93,7 @@ public void testInvalid() {
             () -> randomAlphaOfLength(4));
         final RuntimeException e = expectThrows(RuntimeException.class,
             () -> new SystemdPlugin(false, randomPackageBuildType, esSDNotify));
-        assertThat(e, hasToString(containsString("ES_SD_NOTIFY set to unexpected value [" + esSDNotify + "]")));
+        assertThat(e, hasToString(containsString("OPENSEARCH_SD_NOTIFY set to unexpected value [" + esSDNotify + "]")));
     }
 
     public void testOnNodeStartedSuccess() {

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/ArchiveTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/ArchiveTests.java
@@ -250,7 +250,7 @@ public void test70CustomPathConfAndJvmOptions() throws Exception {
             final List<String> jvmOptions = org.opensearch.common.collect.List.of("-Xms512m", "-Xmx512m", "-Dlog4j2.disable.jmx=true");
             Files.write(tempConf.resolve("jvm.options"), jvmOptions, CREATE, APPEND);
 
-            sh.getEnv().put("ES_JAVA_OPTS", "-XX:-UseCompressedOops");
+            sh.getEnv().put("OPENSEARCH_JAVA_OPTS", "-XX:-UseCompressedOops");
 
             startOpenSearch();
 

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/DockerTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/DockerTests.java
@@ -167,7 +167,7 @@ public void test070BindMountCustomPathConfAndJvmOptions() throws Exception {
 
         // Restart the container
         final Map<Path, Path> volumes = singletonMap(tempDir, Paths.get("/usr/share/opensearch/config"));
-        final Map<String, String> envVars = singletonMap("ES_JAVA_OPTS", "-XX:-UseCompressedOops");
+        final Map<String, String> envVars = singletonMap("OPENSEARCH_JAVA_OPTS", "-XX:-UseCompressedOops");
         runContainer(distribution(), volumes, envVars);
 
         waitForOpenSearch(installation);

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/KeystoreManagementTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/KeystoreManagementTests.java
@@ -259,7 +259,7 @@ public void test50KeystorePasswordFromFile() throws Exception {
         assertPasswordProtectedKeystore();
 
         try {
-            sh.run("sudo systemctl set-environment ES_KEYSTORE_PASSPHRASE_FILE=" + esKeystorePassphraseFile);
+            sh.run("sudo systemctl set-environment OPENSEARCH_KEYSTORE_PASSPHRASE_FILE=" + esKeystorePassphraseFile);
 
             Files.createFile(esKeystorePassphraseFile);
             Files.write(esKeystorePassphraseFile, singletonList(password));
@@ -268,7 +268,7 @@ public void test50KeystorePasswordFromFile() throws Exception {
             ServerUtils.runOpenSearchTests();
             stopOpenSearch();
         } finally {
-            sh.run("sudo systemctl unset-environment ES_KEYSTORE_PASSPHRASE_FILE");
+            sh.run("sudo systemctl unset-environment OPENSEARCH_KEYSTORE_PASSPHRASE_FILE");
         }
     }
 
@@ -279,7 +279,7 @@ public void test51WrongKeystorePasswordFromFile() throws Exception {
         assertPasswordProtectedKeystore();
 
         try {
-            sh.run("sudo systemctl set-environment ES_KEYSTORE_PASSPHRASE_FILE=" + esKeystorePassphraseFile);
+            sh.run("sudo systemctl set-environment OPENSEARCH_KEYSTORE_PASSPHRASE_FILE=" + esKeystorePassphraseFile);
 
             if (Files.exists(esKeystorePassphraseFile)) {
                 rm(esKeystorePassphraseFile);
@@ -292,7 +292,7 @@ public void test51WrongKeystorePasswordFromFile() throws Exception {
             Shell.Result result = runOpenSearchStartCommand(null, false, false);
             assertOpenSearchFailure(result, Arrays.asList(ERROR_INCORRECT_PASSWORD, ERROR_CORRUPTED_KEYSTORE), journaldWrapper);
         } finally {
-            sh.run("sudo systemctl unset-environment ES_KEYSTORE_PASSPHRASE_FILE");
+            sh.run("sudo systemctl unset-environment OPENSEARCH_KEYSTORE_PASSPHRASE_FILE");
         }
     }
 

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/PackageTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/PackageTests.java
@@ -303,7 +303,7 @@ public void test81CustomPathConfAndJvmOptions() throws Exception {
         stopOpenSearch();
 
         withCustomConfig(tempConf -> {
-            append(installation.envFile, "ES_JAVA_OPTS=-XX:-UseCompressedOops");
+            append(installation.envFile, "OPENSEARCH_JAVA_OPTS=-XX:-UseCompressedOops");
 
             startOpenSearch();
 

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/PackagingTestCase.java b/qa/os/src/test/java/org/opensearch/packaging/test/PackagingTestCase.java
@@ -376,7 +376,7 @@ public void assertOpenSearchFailure(Shell.Result result, List<String> expectedMe
             // In Windows, we have written our stdout and stderr to files in order to run
             // in the background
             String wrapperPid = result.stdout.trim();
-            sh.runIgnoreExitCode("Wait-Process -Timeout " + Archives.ES_STARTUP_SLEEP_TIME_SECONDS + " -Id " + wrapperPid);
+            sh.runIgnoreExitCode("Wait-Process -Timeout " + Archives.OPENSEARCH_STARTUP_SLEEP_TIME_SECONDS + " -Id " + wrapperPid);
             sh.runIgnoreExitCode(
                 "Get-EventSubscriber | "
                     + "where {($_.EventName -eq 'OutputDataReceived' -Or $_.EventName -eq 'ErrorDataReceived' |"
@@ -432,17 +432,17 @@ public void withCustomConfig(CheckedConsumer<Path, Exception> action) throws Exc
 
         if (distribution.isPackage()) {
             Files.copy(installation.envFile, tempDir.resolve("opensearch.bk"));// backup
-            append(installation.envFile, "ES_PATH_CONF=" + tempConf + "\n");
+            append(installation.envFile, "OPENSEARCH_PATH_CONF=" + tempConf + "\n");
         } else {
-            sh.getEnv().put("ES_PATH_CONF", tempConf.toString());
+            sh.getEnv().put("OPENSEARCH_PATH_CONF", tempConf.toString());
         }
 
         action.accept(tempConf);
         if (distribution.isPackage()) {
             IOUtils.rm(installation.envFile);
             Files.copy(tempDir.resolve("opensearch.bk"), installation.envFile);
         } else {
-            sh.getEnv().remove("ES_PATH_CONF");
+            sh.getEnv().remove("OPENSEARCH_PATH_CONF");
         }
         IOUtils.rm(tempDir);
     }

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/PluginCliTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/PluginCliTests.java
@@ -117,7 +117,7 @@ public void test23OpenSearchWithSpace() throws Exception {
     }
 
     public void test24JavaOpts() throws Exception {
-        sh.getEnv().put("ES_JAVA_OPTS", "-XX:+PrintFlagsFinal");
+        sh.getEnv().put("OPENSEARCH_JAVA_OPTS", "-XX:+PrintFlagsFinal");
         assertWithExamplePlugin(installResult -> assertThat(installResult.stdout, containsString("MaxHeapSize")));
     }
 

diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/WindowsServiceTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/WindowsServiceTests.java
@@ -273,11 +273,11 @@ public void test70UnknownCommand() {
     }
 
     public void test80JavaOptsInEnvVar() throws Exception {
-        sh.getEnv().put("ES_JAVA_OPTS", "-Xmx2g -Xms2g");
+        sh.getEnv().put("OPENSEARCH_JAVA_OPTS", "-Xmx2g -Xms2g");
         sh.run(serviceScript + " install");
         assertCommand(serviceScript + " start");
         assertStartedAndStop();
-        sh.getEnv().remove("ES_JAVA_OPTS");
+        sh.getEnv().remove("OPENSEARCH_JAVA_OPTS");
     }
 
     public void test81JavaOptsInJvmOptions() throws Exception {

diff --git a/qa/os/src/test/java/org/opensearch/packaging/util/Archives.java b/qa/os/src/test/java/org/opensearch/packaging/util/Archives.java
@@ -65,7 +65,7 @@ public class Archives {
 
     /** This is an arbitrarily chosen value that gives OpenSearch time to log Bootstrap
      *  errors to the console if they occur before the logging framework is initialized. */
-    public static final String ES_STARTUP_SLEEP_TIME_SECONDS = "10";
+    public static final String OPENSEARCH_STARTUP_SLEEP_TIME_SECONDS = "10";
 
     public static Installation installArchive(Shell sh, Distribution distribution) throws Exception {
         return installArchive(sh, distribution, getDefaultArchiveInstallPath(), getCurrentVersion());
@@ -233,7 +233,7 @@ public static Shell.Result startOpenSearchWithTty(Installation installation, She
             keystorePassword
         );
 
-        sh.getEnv().put("ES_STARTUP_SLEEP_TIME", ES_STARTUP_SLEEP_TIME_SECONDS);
+        sh.getEnv().put("OPENSEARCH_STARTUP_SLEEP_TIME", OPENSEARCH_STARTUP_SLEEP_TIME_SECONDS);
         return sh.runIgnoreExitCode(script);
     }
 
@@ -258,7 +258,7 @@ public static Shell.Result runOpenSearchStartCommand(
             }
 
             // We need to give OpenSearch enough time to print failures to stderr before exiting
-            sh.getEnv().put("ES_STARTUP_SLEEP_TIME", ES_STARTUP_SLEEP_TIME_SECONDS);
+            sh.getEnv().put("OPENSEARCH_STARTUP_SLEEP_TIME", OPENSEARCH_STARTUP_SLEEP_TIME_SECONDS);
 
             List<String> command = new ArrayList<>();
             command.add("sudo -E -u ");
@@ -332,7 +332,7 @@ public static Shell.Result runOpenSearchStartCommand(
                     + keystorePassword
                     + "'); "
                     + "Wait-Process -Timeout "
-                    + ES_STARTUP_SLEEP_TIME_SECONDS
+                    + OPENSEARCH_STARTUP_SLEEP_TIME_SECONDS
                     + " -Id $process.Id; "
                     + "$process.Id;"
             );