Dont need to set inputs for sc and security mode

aerospike · Oct 7, 2024 · bf620c0 · bf620c0
1 parent dae8c4c
commit bf620c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml
@@ -8,9 +8,6 @@ inputs:
   server-tag:
     required: true
     default: 'latest'
-  feature-to-enable:
-    required: false
-    default: security
   # Github Composite Actions can't access secrets
   # so we need to pass them in as inputs
   docker-hub-username:
@@ -28,7 +25,6 @@ runs:
       server-tag: ${{ inputs.server-tag }}
       docker-hub-username: ${{ inputs.docker-hub-username }}
       docker-hub-password: ${{ inputs.docker-hub-password }}
-      feature-to-enable: ${{ inputs.feature-to-enable }}
 
   - name: Get IP address of Docker container hosting server
     id: get-server-ip-address

diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml
@@ -35,8 +35,15 @@ runs:
     run: |
       crudini --existing=param --set config.conf enterprise-edition hosts ''
       crudini --existing=param --set config.conf enterprise-edition hosts 127.0.0.1:3000
-      crudini --existing=param --set config.conf enterprise-edition user superuser
-      crudini --existing=param --set config.conf enterprise-edition password superuser
+    working-directory: test
+    shell: bash
+
+  - run: echo SUPERUSER_NAME_AND_PASSWORD="superuser" >> $GITHUB_ENV
+    shell: bash
+
+  - run: |
+      crudini --existing=param --set config.conf enterprise-edition user ${{ env.SUPERUSER_NAME_AND_PASSWORD }}
+      crudini --existing=param --set config.conf enterprise-edition password ${{ env.SUPERUSER_NAME_AND_PASSWORD }}
     working-directory: test
     shell: bash
 
@@ -85,7 +92,7 @@ runs:
       is-security-enabled: true
       is-strong-consistency-enabled: true
 
-  - run: echo ASADM_AUTH_FLAGS="--user=superuser --password=superuser" >> $GITHUB_ENV
+  - run: echo ASADM_AUTH_FLAGS="--user=${{ env.SUPERUSER_NAME_AND_PASSWORD }} --password=${{ env.SUPERUSER_NAME_AND_PASSWORD }}" >> $GITHUB_ENV
     shell: bash
 
   - run: docker exec ${{ env.CONTAINER_NAME }} asadm $ASADM_AUTH_FLAGS --enable --execute "manage revive ns test"

diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -63,7 +63,6 @@ jobs:
         server-tag: ${{ inputs.server-tag }}
         docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
         docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }}
-        feature-to-enable: strong-consistency
 
     - run: sudo apt update
     - run: sudo apt install valgrind -y