Account for EOF requirement

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
opensearch-project · Nov 14, 2022 · e06fc10 · e06fc10
1 parent 008149f
commit e06fc10
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/actions/start-opensearch-with-one-plugin/action.yml b/.github/actions/start-opensearch-with-one-plugin/action.yml
@@ -61,25 +61,30 @@ runs:
 
     # Install the plugin, runs its start-script, and start the OpenSearch server
     - name: Install Plugin into OpenSearch for Linux
-      if: ${{ runner.os == 'Linux'}}
+      if: ${{ runner.os == 'Linux'}} && ${{ !inputs.plugin-install-script }}
       run: |
         cat > os-ep.sh <<EOF
         yes | opensearch-plugin install file:///docker-host/${{ inputs.docker-host-plugin-zip }}.zip
+        chown 1001:1001 -R /opensearch
+        su -c "/opensearch/bin/opensearch" -s /bin/bash opensearch
+        EOF
       shell: bash
 
     - name: Run Install Script in Provided for Linux
       if: ${{ inputs.plugin-install-script }} && ${{ runner.os == 'Linux' }}
       run: |
+        cat > os-ep.sh <<EOF
+        yes | opensearch-plugin install file:///docker-host/${{ inputs.docker-host-plugin-zip }}.zip
         chmod +x plugins/${{ inputs.plugin-name }}/tools/${{ inputs.plugin-demo-script }}.sh
         yes | plugins/${{ inputs.plugin-name }}/tools/${{ inputs.plugin-demo-script }}.sh
+        chown 1001:1001 -R /opensearch
+        su -c "/opensearch/bin/opensearch" -s /bin/bash opensearch
+        EOF
       shell: bash
 
     - name: Finish Linux Install
       if: ${{ runner.os == 'Linux' }}
       run: |
-        chown 1001:1001 -R /opensearch
-        su -c "/opensearch/bin/opensearch" -s /bin/bash opensearch
-        EOF
         docker build -t opensearch-test -f- . <<EOF
         FROM ubuntu:latest
         COPY --chown=1001:1001 os-ep.sh /docker-host/