Test publish phase.

Signed-off-by: Revital Sur <[email protected]>
dolfim-ibm · Jul 3, 2024 · 58517f3 · 58517f3
1 parent d1842a6
commit 58517f3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
             - id: version
               run: |
                  publish_images='false'
-                 if  [[ ${GITHUB_REF} != refs/heads/dev && ${GITHUB_EVENT_NAME} != 'pull_request' && ${GITHUB_REPOSITORY} == IBM/data-prep-kit ]] ;
+                 if  [[ ${GITHUB_REF} != refs/heads/dev && ${GITHUB_REPOSITORY} == IBM/data-prep-kit ]] ;
                  then
                    publish_images='true'
                  fi
@@ -353,7 +353,9 @@ jobs:
         - name: Publish images
           if: needs.infer_version.outputs.publish_images == 'true'
 #           run: make -C transforms -C kfp-kfp_ray_componenets publish
-          run: echo "make -C transforms/code publish"
+          run: |
+               make -C data-processing-lib/spark/ publish-image
+               make -C transforms/code publish
     push-universal-images:
         name: Push universal images with latest tag
         runs-on: ubuntu-22.04
@@ -386,7 +388,7 @@ jobs:
                make -C transforms/universal docker-load-image
         - name: Publish images
           if: needs.infer_version.outputs.publish_images == 'true'
-          run: echo "make -C transforms/universal publish"
+          run: make -C transforms/universal publish
     push-language-images:
         name: Push language images with latest tag
         runs-on: ubuntu-22.04
@@ -419,7 +421,7 @@ jobs:
                make -C transforms/language docker-load-image
         - name: Publish images
           if: needs.infer_version.outputs.publish_images == 'true'
-          run: echo "make -C transforms/language publish"
+          run: make -C transforms/language publish
     push-kfp-images:
         name: Push kfp images with latest tag
         runs-on: ubuntu-22.04
@@ -452,7 +454,7 @@ jobs:
                make -C kfp/kfp_ray_components docker-load-image
         - name: Publish images
           if: needs.infer_version.outputs.publish_images == 'true'
-          run: echo "make -C kfp/kfp_ray_components publish"
+          run: make -C kfp/kfp_ray_components publish
 
 
 

diff --git a/data-processing-lib/spark/Makefile b/data-processing-lib/spark/Makefile
@@ -29,6 +29,8 @@ publish:: publish-dist
 
 publish-dist :: .check-env .defaults.publish-dist 
 
+publish-image:: .defaults.publish-image
+
 venv::  pyproject.toml
 	$(MAKE) .defaults.spark-lib-src-venv
 	pip install pytest pytest-cov 

diff --git a/kfp/kfp_ray_components/Makefile b/kfp/kfp_ray_components/Makefile
@@ -67,9 +67,9 @@ docker-save-image:
 .PHONY: publish
 publish:
 	echo "Publishing kfp-data-processing"
-	$(MAKE) KFPv2=0 DOCKER_IMAGE_NAME="kfp-data-processing" DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION} build .defaults.publish-image
+	$(MAKE) KFPv2=0 DOCKER_IMAGE_NAME="kfp-data-processing" DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION} .defaults.publish-image
 	echo "Publishing kfp-data-processing_v2"
-	$(MAKE) KFPv2=1 DOCKER_IMAGE_NAME="kfp-data-processing_v2" DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION_v2} build .defaults.publish-image
+	$(MAKE) KFPv2=1 DOCKER_IMAGE_NAME="kfp-data-processing_v2" DOCKER_IMAGE_VERSION=${KFP_DOCKER_VERSION_v2} .defaults.publish-image
 
 test::
 

diff --git a/transforms/.make.transforms b/transforms/.make.transforms
@@ -172,15 +172,15 @@ test-locals:: .transforms.test-locals
 .PHONY: .transforms.test-locals
 .transforms.test-locals:: .defaults.test-locals
 
-# Build the image the transform way and then use the default publishing
+# Publish the image assuming its already built.
 .PHONY: .transforms.publish-image-python
-.transforms.publish-image-python:: .transforms.python-image .defaults.publish-image
+.transforms.publish-image-python:: .defaults.publish-image
 
 .PHONY: .transforms.publish-image-ray
-.transforms.publish-image-ray:: .transforms.ray-image .defaults.publish-image
+.transforms.publish-image-ray:: .defaults.publish-image
 
 .PHONY: .transforms.publish-image-spark
-.transforms.publish-image-spark:: .transforms.spark-image .defaults.publish-image
+.transforms.publish-image-spark:: .defaults.publish-image
 
 .PHONY: .transforms-check-exists
 .transforms-check-exists: