fixup

Signed-off-by: Shawn Hurley <shawn@hurley.page>

Author: shawn-hurley

.github/workflows/demo-testing.yml

@@ -45,7 +45,7 @@ jobs:
     with:
       repo: ${{ github.repository }}
       ref: ${{ github.ref }}
-    
+
   provider-tests:
     needs: [detect-changes, build-images]
     runs-on: ubuntu-latest
@@ -56,48 +56,49 @@ jobs:
       matrix:
         include:
           - provider: java
-            artifact_pattern: "{konveyor-analyzer-lsp,java-provider}"
+            artifact_pattern: "*{analyzer-lsp,java-external-provider}"
             test-data: external-providers/java-external-provider/examples
-            image_name: java-provider
+            image_env: IMG_JAVA_PROVIDER
             demo-output-path: external-providers/java-external-provider/e2e-tests/demo-output.yaml
             provider_settings-path: external-providers/java-external-provider/e2e-tests/provider_settings.json
             testing-rules: external-providers/java-external-provider/e2e-tests/rule-example.yaml
             # Generic golang
           - provider: generic
-            artifact_pattern: "{konveyor-analyzer-lsp,generic-provider,golang-dep-provider}"
+            artifact_pattern: "*{analyzer-lsp,generic-external-provider}"
             test-data: examples
-            image_name: generic-provider
+            image_env: IMG_GENERIC_PROVIDER
             demo-output-path: external-providers/generic-external-provider/e2e-tests/golang-e2e/demo-output.yaml
             provider_settings-path: external-providers/generic-external-provider/e2e-tests/golang-e2e/provider_settings.json
             testing-rules: external-providers/generic-external-provider/e2e-tests/golang-e2e/rule-example.yaml
             # Generic python
           - provider: generic
-            artifact_pattern: "{konveyor-analyzer-lsp,generic-provider}"
+            artifact_pattern: "*{analyzer-lsp,generic-external-provider}"
             test-data: examples
-            image_name: generic-provider
+            image_env: IMG_GENERIC_PROVIDER
             demo-output-path: external-providers/generic-external-provider/e2e-tests/python-e2e/demo-output.yaml
             provider_settings-path: external-providers/generic-external-provider/e2e-tests/python-e2e/provider_settings.json
             testing-rules: external-providers/generic-external-provider/e2e-tests/python-e2e/rule-example.yaml
             # Generic nodejs
           - provider: generic
-            artifact_pattern: "{konveyor-analyzer-lsp,generic-provider}"
+            artifact_pattern: "*{analyzer-lsp,generic-external-provider}"
             test-data: examples
-            image_name: generic-provider
+            image_env: IMG_GENERIC_PROVIDER
             demo-output-path: external-providers/generic-external-provider/e2e-tests/nodejs-e2e/demo-output.yaml
             provider_settings-path: external-providers/generic-external-provider/e2e-tests/nodejs-e2e/provider_settings.json
             testing-rules: external-providers/generic-external-provider/e2e-tests/nodejs-e2e/rule-example.yaml
           - provider: yq
-            artifact_pattern: "{konveyor-analyzer-lsp,yq-provider}"
+            artifact_pattern: "*{analyzer-lsp,yq-external-provider}"
             test-data: examples
-            image_name: yq-provider
+            image_env: IMG_YQ_PROVIDER
             demo-output-path: external-providers/yq-external-provider/e2e-tests/demo-output.yaml
             provider_settings-path: external-providers/yq-external-provider/e2e-tests/provider_settings.json
             testing-rules: external-providers/yq-external-provider/e2e-tests/rule-example.yaml
           - provider: c-sharp
             repo: "konveyor/c-sharp-analyzer-provider"
-            artifact_pattern: "{konveyor-analyzer-lsp,c-sharp-provider}"
+            artifact_pattern: "*{analyzer-lsp}"
+            nightly_pattern: "*{c-sharp-provider}"
             test-data: testdata
-            image_name: c-sharp-provider
+            image_env: IMG_C_SHARP_PROVIDER 
             demo-output-path: e2e-tests/demo-output.yaml
             provider_settings-path: e2e-tests/provider_settings.json
             testing-rules: rulesets
@@ -114,13 +115,50 @@ jobs:
           pattern: ${{ format('{0}--{1}', matrix.artifact_pattern, github.run_id) }}
           path: /tmp/images
           merge-multiple: true
+      
+      - name: Get nightly if needed
+        if: needs.detect-changes.outputs[matrix.provider] == 'true' && matrix.nightly_pattern != ''
+        env:
+          GH_TOKEN: ${{ github.token }}
+        shell: bash
+        run: |
+          WORKFLOW_RUN=$(gh run list -R=konveyor/ci --workflow=nightly-koncur.yaml --branch=main --status=success --limit=1 --json databaseId --jq '.[0].databaseId')
+          gh run download -R=konveyor/ci "$WORKFLOW_RUN" --pattern "${{ matrix.nightly_pattern }}--*_20[0-9][0-9].[0-9][0-9].[0-9][0-9]" --dir /tmp/images" 2>&1 |
 
       - name: Load images into podman
         if: needs.detect-changes.outputs[matrix.provider] == 'true'
         run: |
+          java_provider_image_regex=".*java(-external)?-provider.*"
+          generic_provider_image_regex=".*generic(-external)?-provider.*"
+          yq_provider_image_regex=".*yq-external-provider.*
+          analyzer_regex=".*analyzer-lsp.*"
+          c_sharp_provider_image_regex = ".*c-sharp-provider.*"
+
           for image in $(find /tmp/images -type f -name "*.tar"); do
             echo "Loading image: ${image}"
-            podman load -i "${image}"
+            image=${podman load -i "${image}" | awk '{print $NF}')
+            
+            if [[ "$image" =~ $java_provider_image_regex ]]; then
+              echo "Java Provider Image Found Set Env Var: JAVA_PROVIDER_IMG=$image"
+              echo "IMG_JAVA_PROVIDER=$image" >> $GITHUB_ENV
+            fi
+            if [[ "$image" =~ $c_sharp_provider_image_regex ]]; then
+              echo "Java Provider Image Found Set Env Var: IMG_C_SHARP_PROVIDER=$image"
+              echo "IMG_C_SHARP_PROVIDER=$image" >> $GITHUB_ENV
+            fi
+            if [[ "$image" =~ $analyzer_regex ]]; then
+              echo "Analyzer image  Found Set Env Var: IMG_ANALYZER=$image"
+              echo "IMG_ANALYZER=$image" >> $GITHUB_ENV
+            fi
+            
+            if [[ "$image" =~ $generic_provider_image_regex ]]; then
+              echo "Generic Provider Image Found Set Env Var: GENERIC_PROVIDER_IMG=$image"
+              echo "IMG_GENERIC_PROVIDER=$image" >> $GITHUB_ENV
+            fi
+            if [[ "$image" =~ $yq_provider_image_regex ]]; then
+              echo "Generic Provider Image Found Set Env Var: IMG_YQ_PROVIDER=$image"
+              echo "IMG_GENERIC_PROVIDER=$image" >> $GITHUB_ENV
+            fi
           done
           echo "Loaded images:"
           podman images
@@ -132,7 +170,7 @@ jobs:
           podman volume create test-data
           podman run --rm -v test-data:/target:U,Z -v $(pwd)/${{ matrix.test-data }}:/src/:U,Z --entrypoint=cp alpine -a /src/. /target/
           podman pod create --name=analyzer-${{ matrix.provider }}
-          podman run --pod analyzer-${{ matrix.provider }} --name ${{ matrix.provider }}-provider -d -v test-data:/analyzer-lsp/examples:U,Z localhost/${{ matrix.image_name }}:${{ github.run_id }} --port 14651
+          podman run --pod analyzer-${{ matrix.provider }} --name ${{ matrix.provider }}-provider -d -v test-data:/analyzer-lsp/examples:U,Z ${{ matrix.image_env}}:${{ github.run_id }} --port 14651
           podman run --entrypoint /usr/local/bin/konveyor-analyzer --pod=analyzer-${{ matrix.provider }} \
             -v test-data:/analyzer-lsp/examples:U,Z \
             -v $(pwd)/${{ matrix.demo-output-path }}:/analyzer-lsp/output.yaml:U,Z \