Updates CI workflows to adapt to admin password changes

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · Jan 3, 2024 · e6b5fcf · e6b5fcf
1 parent a889429
commit e6b5fcf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/cypress-test-oidc-e2e.yml b/.github/workflows/cypress-test-oidc-e2e.yml
@@ -12,6 +12,7 @@ env:
   PLUGIN_NAME: opensearch-security
   # This is the SHA256 checksum of the known good kc.sh script for Keycloak version 21.0.1.
   KNOWN_CHECKSUM_OF_KEYCLOAK_SCRIPT: 'f825ea1a9ffa5ad91673737c06857ababbb69b6b8f09e0c637b4c998517f9608'
+  OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
 
 jobs:
   tests:
@@ -157,13 +158,6 @@ jobs:
           echo "THIS IS THE SECURITY CONFIG FILE: "
           cat config.yml
 
-      # TODO: REMOVE THIS ONCE ADMIN JAVA TOOL SUPPORT IT
-      - name: Write password to opensearch_initial_admin_password.txt
-        if: ${{ runner.os == 'Linux'}}
-        run:
-          echo admin >> ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/config/opensearch_initial_admin_password.txt
-        shell: bash
-
       # Run any configuration scripts
       - name: Run Setup Script for Linux
         if: ${{ runner.os == 'Linux' }}
@@ -189,7 +183,7 @@ jobs:
       # Verify that the server is operational
       - name: Check OpenSearch Running on Linux
         if: ${{ runner.os != 'Windows'}}
-        run: curl https://localhost:9200/_cat/plugins -u 'admin:admin' -k -v
+        run: curl https://localhost:9200/_cat/plugins -u 'admin:${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD}}' -k -v
         shell: bash
 
       - if: always()

diff --git a/.github/workflows/cypress-test-saml-e2e.yml b/.github/workflows/cypress-test-saml-e2e.yml
@@ -8,7 +8,8 @@ env:
   # avoid warnings like "tput: No value for $TERM and no -T specified"
   TERM: xterm
   PLUGIN_NAME: opensearch-security
-
+  OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
+
 jobs:
   tests:
     name: Run Cypress E2E SAML tests
@@ -145,7 +146,7 @@ jobs:
       # Verify that the server is operational
       - name: Check OpenSearch Running on Linux
         if: ${{ runner.os != 'Windows'}}
-        run: curl https://localhost:9200/_cat/plugins -u 'admin:admin' -k -v
+        run: curl https://localhost:9200/_cat/plugins -u 'admin:${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD}}' -k -v
         shell: bash
 
       - if: always()