🐛 fix github workflow to use external provider images

Signed-off-by: Pranav Gaikwad <[email protected]>
pranavgaikwad · Jul 17, 2024 · 376ff84 · 376ff84
1 parent 26c0a9b
commit 376ff84
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 33 deletions.
diff --git a/.github/workflows/demo-testing.yml b/.github/workflows/demo-testing.yml
@@ -2,6 +2,11 @@ name: Demo Testing
 
 on: ["push", "pull_request"]
 
+env:
+  IMG_JAVA_PROVIDER: quay.io/konveyor/java-external-provider:latest
+  IMG_DOTNET_PROVIDER: quay.io/konveyor/dotnet-external-provider:latest
+  IMG_GENERIC_PROVIDER: quay.io/konveyor/generic-external-provider:latest
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -62,13 +67,21 @@ jobs:
       # build all provider images and the analyzer-lsp image
       - name: build images
         run: |
-          make build-external
+          make \
+            IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
+            IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
+            IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
+            build-external
           podman build -t quay.io/konveyor/analyzer-lsp:latest -f Dockerfile .
 
       # run the demo in a podman pod
       - name: run demo image
         run : |
-          make run-external-providers-pod
+          make \
+            IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
+            IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
+            IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
+            run-external-providers-pod
           podman build -f demo-local.Dockerfile -t localhost/testing:latest
           make run-demo-image
       
@@ -95,7 +108,11 @@ jobs:
         working-directory: tackle2-addon-analyzer
         run: |
           IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-podman
-          podman save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest
+          podman save -o /tmp/tackle2-addon-analyzer.tar \
+            quay.io/konveyor/tackle2-addon-analyzer:latest \
+            $IMG_JAVA_PROVIDER \
+            $IMG_GENERIC_PROVIDER \
+            $IMG_DOTNET_PROVIDER
 
       - name: Upload image as artifact
         uses: actions/upload-artifact@v3

diff --git a/Makefile b/Makefile
@@ -1,4 +1,9 @@
 DOCKER_IMAGE = test
+IMG_JAVA_PROVIDER ?= java-provider
+IMG_DOTNET_PROVIDER ?= dotnet-provider
+IMG_GENERIC_PROVIDER ?= generic-provider
+IMG_GO_DEP_PROVIDER ?= golang-dep-provider
+IMG_YQ_PROVIDER ?= yq-provider
 OS := $(shell uname -s)
 ifeq ($(OS),Linux)
 	MOUNT_OPT := :z
@@ -32,27 +37,27 @@ image-build:
 build-external: build-dotnet-provider build-golang-dep-provider build-generic-provider build-java-provider build-yq-provider
 
 build-dotnet-provider:
-	podman build -f external-providers/dotnet-external-provider/Dockerfile -t dotnet-provider .
+	podman build -f external-providers/dotnet-external-provider/Dockerfile -t $(IMG_DOTNET_PROVIDER) .
 
 build-generic-provider:
 	sed -i 's,quay.io/konveyor/golang-dependency-provider,golang-dep-provider,g' external-providers/generic-external-provider/Dockerfile
-	podman build -f external-providers/generic-external-provider/Dockerfile -t generic-provider .
+	podman build -f external-providers/generic-external-provider/Dockerfile -t $(IMG_GENERIC_PROVIDER) .
 
 build-golang-dep-provider:
-	podman build -f external-providers/golang-dependency-provider/Dockerfile -t golang-dep-provider .
+	podman build -f external-providers/golang-dependency-provider/Dockerfile -t $(IMG_GO_DEP_PROVIDER) .
 
 build-java-provider:
-	podman build -f external-providers/java-external-provider/Dockerfile -t java-provider .
+	podman build -f external-providers/java-external-provider/Dockerfile -t $(IMG_JAVA_PROVIDER) .
 
 build-yq-provider:
-	podman build -f external-providers/yq-external-provider/Dockerfile -t yq-provider .
+	podman build -f external-providers/yq-external-provider/Dockerfile -t $(IMG_YQ_PROVIDER) .
 
 run-external-providers-local:
-	podman run --name java-provider -d -p 14651:14651 -v $(PWD)/external-providers/java-external-provider/examples:/examples$(MOUNT_OPT) java-provider --port 14651
-	podman run --name yq -d -p 14652:14652 -v $(PWD)/examples:/examples yq-provider$(MOUNT_OPT) --port 14652
-	podman run --name golang-provider -d -p 14653:14653 -v $(PWD)/examples:/examples$(MOUNT_OPT) generic-provider --port 14653
-	podman run --name nodejs -d -p 14654:14654 -v $(PWD)/examples:/examples$(MOUNT_OPT) generic-provider --port 14654 --name nodejs
-	podman run --name python -d -p 14655:14655 -v $(PWD)/examples:/examples$(MOUNT_OPT) generic-provider --port 14655 --name pylsp
+	podman run --name java-provider -d -p 14651:14651 -v $(PWD)/external-providers/java-external-provider/examples:/examples$(MOUNT_OPT) $(IMG_JAVA_PROVIDER) --port 14651
+	podman run --name yq -d -p 14652:14652 -v $(PWD)/examples:/examples $(IMG_YQ_PROVIDER)$(MOUNT_OPT) --port 14652
+	podman run --name golang-provider -d -p 14653:14653 -v $(PWD)/examples:/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14653
+	podman run --name nodejs -d -p 14654:14654 -v $(PWD)/examples:/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14654 --name nodejs
+	podman run --name python -d -p 14655:14655 -v $(PWD)/examples:/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14655 --name pylsp
 
 stop-external-providers:
 	podman kill java-provider || true
@@ -74,11 +79,11 @@ run-external-providers-pod:
 	podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/external-providers/java-external-provider/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
 	# run pods w/ defined ports for the test volumes
 	podman pod create --name=analyzer
-	podman run --pod analyzer --name java-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) java-provider --port 14651
-	podman run --pod analyzer --name yq -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) yq-provider --port 14652
-	podman run --pod analyzer --name golang-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) generic-provider --port 14653
-	podman run --pod analyzer --name nodejs -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) generic-provider --port 14654 --name nodejs
-	podman run --pod analyzer --name python -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) generic-provider --port 14655 --name pylsp
+	podman run --pod analyzer --name java-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_JAVA_PROVIDER) --port 14651
+	podman run --pod analyzer --name yq -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_YQ_PROVIDER) --port 14652
+	podman run --pod analyzer --name golang-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14653
+	podman run --pod analyzer --name nodejs -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14654 --name nodejs
+	podman run --pod analyzer --name python -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14655 --name pylsp
 	podman build -f demo-local.Dockerfile -t localhost/testing:latest
 
 run-demo-image:

diff --git a/demo-output.yaml b/demo-output.yaml
@@ -533,21 +533,6 @@
           name: io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
           package: com.example.apps
       effort: 1
-    lang-ref-004:
-      description: ""
-      category: potential
-      incidents:
-      - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java
-        message: found generic call
-        codeSnip: " 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {\n14          CustomResourceDefinition crd = new CustomResourceDefinition();\n15          System.out.println( crd );\n16  \n17          GenericClass<String> element = new GenericClass<String>(\"Hello world!\");\n18          element.get();\n19      }\n20  }\n"
-        lineNumber: 18
-        variables:
-          VariableName: element
-          file: file:///examples/java/example/src/main/java/com/example/apps/App.java
-          kind: Method
-          name: main
-          package: com.example.apps
-      effort: 1
     maven-javax-to-jakarta-00002:
       description: Move to Jakarta EE Maven Artifacts - replace groupId javax.activation
       category: potential
@@ -1107,4 +1092,5 @@
   unmatched:
   - file-002
   - lang-ref-002
+  - lang-ref-004
   - python-sample-rule-003