Skip to content

Commit

Permalink
Disable ci/cd spark image build when transform does not implement spa…
Browse files Browse the repository at this point in the history
…rk (#604)

* disable test workflow when none code files change

Signed-off-by: David Wood <dawood@us.ibm.com>

* one more path-ignore in test.yml

Signed-off-by: David Wood <dawood@us.ibm.com>

* one more fix for path-ignore in test.yml

Signed-off-by: David Wood <dawood@us.ibm.com>

* test universal transform separately

Signed-off-by: David Wood <dawood@us.ibm.com>

* rename test universal workflow

Signed-off-by: David Wood <dawood@us.ibm.com>

* add comments to noop src to trigger new universal test workflow

Signed-off-by: David Wood <dawood@us.ibm.com>

* fix paths in test universal workflow

Signed-off-by: David Wood <dawood@us.ibm.com>

* addj back ignore paths in test universal workflow

Signed-off-by: David Wood <dawood@us.ibm.com>

* another noop comment

Signed-off-by: David Wood <dawood@us.ibm.com>

* move ignored paths to paths in univesal test workflow

Signed-off-by: David Wood <dawood@us.ibm.com>

* test-universal workflow name changes

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop comments

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop readme change'

Signed-off-by: David Wood <dawood@us.ibm.com>

* change test universal not paths

Signed-off-by: David Wood <dawood@us.ibm.com>

* disable all but new noop and doc_id test workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* code change in noop

Signed-off-by: David Wood <dawood@us.ibm.com>

* remake test transforms

Signed-off-by: David Wood <dawood@us.ibm.com>

* add individual test transform workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop README change

Signed-off-by: David Wood <dawood@us.ibm.com>

* better ignore of .md on test transform workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop readme change

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop test transform worklow 1 ignore

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* split out the tests into test-kfp/lib/misc and remove test.yml, add readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* test-kfp only on kfp/**

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop code change to trigger build

Signed-off-by: David Wood <dawood@us.ibm.com>

* comments in workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* updated workflow readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* only run build-library workflow on data-processing-lib changes

Signed-off-by: David Wood <dawood@us.ibm.com>

* try and ignore docs in build-library, test-kfp/lib

Signed-off-by: David Wood <dawood@us.ibm.com>

* workflow title changes for consistency

Signed-off-by: David Wood <dawood@us.ibm.com>

* test change on filter source

Signed-off-by: David Wood <dawood@us.ibm.com>

* change to lib readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* change to lib source

Signed-off-by: David Wood <dawood@us.ibm.com>

* minor job name changes in transform workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* test-lib workflow ignores

Signed-off-by: David Wood <dawood@us.ibm.com>

* top level readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop test source

Signed-off-by: David Wood <dawood@us.ibm.com>

* filter source change'

Signed-off-by: David Wood <dawood@us.ibm.com>

* updated all transform tets workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* fix typo in test template on check_images

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop src change

Signed-off-by: David Wood <dawood@us.ibm.com>

* check for makefile in test transform workflow

Signed-off-by: David Wood <dawood@us.ibm.com>

* automatically determine transforms in transforms directory for which to generate test workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* worklow readme, transform existence verification, disable build-library, and tools tests

Signed-off-by: David Wood <dawood@us.ibm.com>

* workflow readme details on kfp and misc tests

Signed-off-by: David Wood <dawood@us.ibm.com>

* backing out change to dpk lib code

Signed-off-by: David Wood <dawood@us.ibm.com>

* restore filter code

Signed-off-by: David Wood <dawood@us.ibm.com>

* restore noop code

Signed-off-by: David Wood <dawood@us.ibm.com>

* workflow readme

Signed-off-by: David Wood <dawood@us.ibm.com>

* really restore noop code

Signed-off-by: David Wood <dawood@us.ibm.com>

* check for makefile in transform test-src testing

Signed-off-by: David Wood <dawood@us.ibm.com>

* don't include lib test dependencies in transform test workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* noop code change

Signed-off-by: David Wood <dawood@us.ibm.com>

* disable noop, don't include lib test-data in transform dependencies

Signed-off-by: David Wood <dawood@us.ibm.com>

* use job.id.if on Makefile to enable transform test job

Signed-off-by: David Wood <dawood@us.ibm.com>

* use job.id.if on Makefile to enable transform test job

Signed-off-by: David Wood <dawood@us.ibm.com>

* restore noop Makefile

Signed-off-by: David Wood <dawood@us.ibm.com>

* exclude kfp_ray from transfor test workflow and change noop code

Signed-off-by: David Wood <dawood@us.ibm.com>

* remove if: from test workflows

Signed-off-by: David Wood <dawood@us.ibm.com>

* backout noop code change

Signed-off-by: David Wood <dawood@us.ibm.com>

* backout noop code change

Signed-off-by: David Wood <dawood@us.ibm.com>

* only build spark image for transform image tests that need it

Signed-off-by: David Wood <dawood@us.ibm.com>

* header_cleanser code change

Signed-off-by: David Wood <dawood@us.ibm.com>

* only build spark image for transform image tests that need it

Signed-off-by: David Wood <dawood@us.ibm.com>

---------

Signed-off-by: David Wood <dawood@us.ibm.com>
  • Loading branch information
daw3rd authored Sep 20, 2024
1 parent e4dac0b commit eba80df
Show file tree
Hide file tree
Showing 23 changed files with 67 additions and 23 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test-code-code2parquet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/code/code2parquet
run: |
if [ -e "transforms/code/code2parquet/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/code/code2parquet/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/code/code2parquet DOCKER=docker test-image
else
echo "transforms/code/code2parquet/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-code-code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/code/code_quality
run: |
if [ -e "transforms/code/code_quality/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/code/code_quality/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/code/code_quality DOCKER=docker test-image
else
echo "transforms/code/code_quality/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-code-header_cleanser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/code/header_cleanser
run: |
if [ -e "transforms/code/header_cleanser/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/code/header_cleanser/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/code/header_cleanser DOCKER=docker test-image
else
echo "transforms/code/header_cleanser/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-code-malware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/code/malware
run: |
if [ -e "transforms/code/malware/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/code/malware/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/code/malware DOCKER=docker test-image
else
echo "transforms/code/malware/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-code-proglang_select.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/code/proglang_select
run: |
if [ -e "transforms/code/proglang_select/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/code/proglang_select/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/code/proglang_select DOCKER=docker test-image
else
echo "transforms/code/proglang_select/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-code-repo_level_ordering.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/code/repo_level_ordering
run: |
if [ -e "transforms/code/repo_level_ordering/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/code/repo_level_ordering/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/code/repo_level_ordering DOCKER=docker test-image
else
echo "transforms/code/repo_level_ordering/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-language-doc_chunk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/language/doc_chunk
run: |
if [ -e "transforms/language/doc_chunk/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/language/doc_chunk/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/language/doc_chunk DOCKER=docker test-image
else
echo "transforms/language/doc_chunk/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-language-doc_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/language/doc_quality
run: |
if [ -e "transforms/language/doc_quality/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/language/doc_quality/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/language/doc_quality DOCKER=docker test-image
else
echo "transforms/language/doc_quality/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-language-lang_id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/language/lang_id
run: |
if [ -e "transforms/language/lang_id/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/language/lang_id/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/language/lang_id DOCKER=docker test-image
else
echo "transforms/language/lang_id/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-language-pdf2parquet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/language/pdf2parquet
run: |
if [ -e "transforms/language/pdf2parquet/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/language/pdf2parquet/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/language/pdf2parquet DOCKER=docker test-image
else
echo "transforms/language/pdf2parquet/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-language-pii_redactor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/language/pii_redactor
run: |
if [ -e "transforms/language/pii_redactor/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/language/pii_redactor/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/language/pii_redactor DOCKER=docker test-image
else
echo "transforms/language/pii_redactor/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-language-text_encoder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/language/text_encoder
run: |
if [ -e "transforms/language/text_encoder/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/language/text_encoder/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/language/text_encoder DOCKER=docker test-image
else
echo "transforms/language/text_encoder/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-transform.template
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in @TARGET_TRANSFORM_DIR@
run: |
if [ -e "@TARGET_TRANSFORM_DIR@/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "@TARGET_TRANSFORM_DIR@/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C @TARGET_TRANSFORM_DIR@ DOCKER=docker test-image
else
echo "@TARGET_TRANSFORM_DIR@/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-doc_id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/doc_id
run: |
if [ -e "transforms/universal/doc_id/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/doc_id/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/doc_id DOCKER=docker test-image
else
echo "transforms/universal/doc_id/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-ededup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/ededup
run: |
if [ -e "transforms/universal/ededup/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/ededup/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/ededup DOCKER=docker test-image
else
echo "transforms/universal/ededup/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-fdedup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/fdedup
run: |
if [ -e "transforms/universal/fdedup/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/fdedup/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/fdedup DOCKER=docker test-image
else
echo "transforms/universal/fdedup/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-filter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/filter
run: |
if [ -e "transforms/universal/filter/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/filter/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/filter DOCKER=docker test-image
else
echo "transforms/universal/filter/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-html2parquet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/html2parquet
run: |
if [ -e "transforms/universal/html2parquet/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/html2parquet/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/html2parquet DOCKER=docker test-image
else
echo "transforms/universal/html2parquet/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-noop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/noop
run: |
if [ -e "transforms/universal/noop/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/noop/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/noop DOCKER=docker test-image
else
echo "transforms/universal/noop/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-profiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/profiler
run: |
if [ -e "transforms/universal/profiler/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/profiler/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/profiler DOCKER=docker test-image
else
echo "transforms/universal/profiler/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-resize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/resize
run: |
if [ -e "transforms/universal/resize/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/resize/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/resize DOCKER=docker test-image
else
echo "transforms/universal/resize/Makefile not found - testing disabled for this transform."
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-universal-tokenization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ jobs:
- name: Test transform image in transforms/universal/tokenization
run: |
if [ -e "transforms/universal/tokenization/Makefile" ]; then
make -C data-processing-lib/spark DOCKER=docker image
if [ -d "transforms/universal/tokenization/spark" ]; then
make -C data-processing-lib/spark DOCKER=docker image
fi
make -C transforms/universal/tokenization DOCKER=docker test-image
else
echo "transforms/universal/tokenization/Makefile not found - testing disabled for this transform."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ def __init__(self):

if __name__ == "__main__":
launcher = PythonTransformLauncher(HeaderCleanserPythonTransformConfiguration())
logger.info("Launching license copyright header removal")
logger.info("Launching license copyright header removal.")
launcher.launch()

0 comments on commit eba80df

Please sign in to comment.