Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .make.* to triggers for transform tests. #658

Closed
wants to merge 81 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
3fe8d2c
disable test workflow when none code files change
daw3rd Sep 13, 2024
86951f8
one more path-ignore in test.yml
daw3rd Sep 16, 2024
d368dc7
one more fix for path-ignore in test.yml
daw3rd Sep 16, 2024
6d7c186
test universal transform separately
daw3rd Sep 17, 2024
35f9f31
rename test universal workflow
daw3rd Sep 17, 2024
37cd7ef
add comments to noop src to trigger new universal test workflow
daw3rd Sep 17, 2024
a7fa50b
fix paths in test universal workflow
daw3rd Sep 17, 2024
300d06a
addj back ignore paths in test universal workflow
daw3rd Sep 17, 2024
0154179
another noop comment
daw3rd Sep 17, 2024
5dd78e6
move ignored paths to paths in univesal test workflow
daw3rd Sep 17, 2024
d91da0d
test-universal workflow name changes
daw3rd Sep 17, 2024
1be3292
noop comments
daw3rd Sep 17, 2024
54d48b6
noop readme change'
daw3rd Sep 17, 2024
288ffdf
change test universal not paths
daw3rd Sep 17, 2024
668b70d
disable all but new noop and doc_id test workflows
daw3rd Sep 17, 2024
aa24ee7
code change in noop
daw3rd Sep 17, 2024
1d72cf5
remake test transforms
daw3rd Sep 17, 2024
142da80
Merge branch 'dev' into cicd-opt
daw3rd Sep 17, 2024
6bee51b
add individual test transform workflows
daw3rd Sep 17, 2024
db18c74
noop README change
daw3rd Sep 17, 2024
42e18fc
better ignore of .md on test transform workflows
daw3rd Sep 17, 2024
ca09d75
noop readme change
daw3rd Sep 17, 2024
f16780b
noop test transform worklow 1 ignore
daw3rd Sep 17, 2024
189bdd7
noop readme
daw3rd Sep 17, 2024
54b3c69
split out the tests into test-kfp/lib/misc and remove test.yml, add r…
daw3rd Sep 17, 2024
d530ac9
test-kfp only on kfp/**
daw3rd Sep 17, 2024
781113f
noop code change to trigger build
daw3rd Sep 17, 2024
f09fbee
comments in workflows
daw3rd Sep 17, 2024
193f439
updated workflow readme
daw3rd Sep 17, 2024
3ed0fbd
only run build-library workflow on data-processing-lib changes
daw3rd Sep 17, 2024
60343d3
try and ignore docs in build-library, test-kfp/lib
daw3rd Sep 17, 2024
dec3aa9
workflow title changes for consistency
daw3rd Sep 17, 2024
e6b1d62
test change on filter source
daw3rd Sep 17, 2024
c40cf1f
change to lib readme
daw3rd Sep 17, 2024
c4853d1
change to lib source
daw3rd Sep 17, 2024
6badd06
Merge branch 'dev' into cicd-opt
daw3rd Sep 17, 2024
c4417fc
minor job name changes in transform workflows
daw3rd Sep 17, 2024
8270c6c
noop readme
daw3rd Sep 17, 2024
dc06b94
test-lib workflow ignores
daw3rd Sep 17, 2024
428833e
top level readme
daw3rd Sep 17, 2024
0bd7992
noop test source
daw3rd Sep 17, 2024
31b7f53
filter source change'
daw3rd Sep 17, 2024
e78df7b
updated all transform tets workflows
daw3rd Sep 17, 2024
684ae7a
fix typo in test template on check_images
daw3rd Sep 18, 2024
f419059
noop src change
daw3rd Sep 18, 2024
a887bf9
check for makefile in test transform workflow
daw3rd Sep 18, 2024
f9399c1
automatically determine transforms in transforms directory for which …
daw3rd Sep 18, 2024
e064e00
worklow readme, transform existence verification, disable build-libra…
daw3rd Sep 18, 2024
3a81d21
workflow readme details on kfp and misc tests
daw3rd Sep 18, 2024
5d957ed
backing out change to dpk lib code
daw3rd Sep 19, 2024
b02b52c
restore filter code
daw3rd Sep 19, 2024
7cb4390
restore noop code
daw3rd Sep 19, 2024
b780cf5
workflow readme
daw3rd Sep 19, 2024
9a5ccdc
really restore noop code
daw3rd Sep 19, 2024
93c56c2
check for makefile in transform test-src testing
daw3rd Sep 19, 2024
8f8592d
don't include lib test dependencies in transform test workflows
daw3rd Sep 19, 2024
40ce888
noop code change
daw3rd Sep 19, 2024
cb0d1f9
disable noop, don't include lib test-data in transform dependencies
daw3rd Sep 19, 2024
d6c5784
use job.id.if on Makefile to enable transform test job
daw3rd Sep 19, 2024
4f6b2f2
use job.id.if on Makefile to enable transform test job
daw3rd Sep 19, 2024
c0f4935
restore noop Makefile
daw3rd Sep 19, 2024
0a09daa
exclude kfp_ray from transfor test workflow and change noop code
daw3rd Sep 19, 2024
1bfb33d
remove if: from test workflows
daw3rd Sep 19, 2024
a80c0fd
backout noop code change
daw3rd Sep 19, 2024
ee08033
backout noop code change
daw3rd Sep 19, 2024
30a1524
only build spark image for transform image tests that need it
daw3rd Sep 20, 2024
6d6a233
header_cleanser code change
daw3rd Sep 20, 2024
b062ae0
Merge branch 'dev' into cicd-opt
daw3rd Sep 20, 2024
f495f82
only build spark image for transform image tests that need it
daw3rd Sep 20, 2024
eac1c9c
Merge branch 'dev' into cicd-opt
daw3rd Oct 2, 2024
85f9bed
update workflows to trigger on .make.* changes
daw3rd Oct 2, 2024
19d3edf
blank line added to .make.versions to test new workflows
daw3rd Oct 2, 2024
1086fc8
remove change to .make.versions
daw3rd Oct 2, 2024
5a44432
remove test-universal-html2parquet.yml since it is now moved to language
daw3rd Oct 3, 2024
ad3347c
mv kfp blacklist definition to check-workflows.sh script and have it …
daw3rd Oct 3, 2024
e8611eb
license_select_wf.py comment to trigger kfp tests here
daw3rd Oct 3, 2024
e369340
have transform top level makefile check for kfp_ray directory before …
daw3rd Oct 3, 2024
602719a
fix doc_quality Makefile kfp rules
daw3rd Oct 3, 2024
5dcc092
fix tabbing in recent Makefile updates
daw3rd Oct 3, 2024
7947986
fix kfp workflows to only build the target transform
daw3rd Oct 3, 2024
0fbb40e
switch workflows from ubuntu-22.04 to ubuntu-latest to try and avoid …
daw3rd Oct 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ LANG_TRANSFORMS=doc_chunk doc_quality lang_id pdf2parquet pii_redactor text_enco


# A list that holds transforms that should not be tested with KFP
KFP_BLACK_LIST="doc_chunk,pdf2parquet,pii_redactor"

transform-tests:
$(MAKE) TRANSFORM_SUBDIR=universal .transform-tests
Expand All @@ -29,13 +28,19 @@ transform-tests:
done

.transform-kfp-tests:
@for i in $$(find ../../transforms/$(TRANSFORM_SUBDIR) -mindepth 1 -maxdepth 1 -type d); do \
@KFP_BLACK_LIST=$$(cd ../..; bash scripts/check-workflows.sh -show-kfp-black-list); \
for i in $$(find ../../transforms/$(TRANSFORM_SUBDIR) -mindepth 1 -maxdepth 1 -type d); do \
dir=$$(basename $$i); \
z=$$(echo ${KFP_BLACK_LIST} | grep -v $$dir); \
if [ ! -d ../../transforms/$(TRANSFORM_SUBDIR)/$$dir/kfp_ray ] || [ -z "$$z" ]; then \
yml=test-$(TRANSFORM_SUBDIR)-$$dir-kfp.yml; \
if [ ! -d ../../transforms/$(TRANSFORM_SUBDIR)/$$dir/kfp_ray ]; then \
echo No kfp_ray directory for $$dir. Skipping generation of $$yml; \
continue; \
fi; \
z=$$(echo $${KFP_BLACK_LIST} | grep $$dir); \
if [ ! -z "$$z" ]; then \
echo $$dir is black listed. Skipping generation of $$yml; \
continue; \
fi; \
yml=test-$(TRANSFORM_SUBDIR)-$$dir-kfp.yml; \
echo Generating $$yml; \
cat test-kfp-transform.template | sed -e "s?@TARGET_TRANSFORM_DIR@?transforms/$${TRANSFORM_SUBDIR}/$$dir?g" > $$yml; \
done
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "releases/**"
jobs:
deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
env:
REPO_URL: "https://github.com/${{ github.repository }}"
REPO_BRANCH: "dev"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
jobs:
build-package:
name: Build Ray data processing libraries
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:
name: Publish packages to test.pypi.org
# disabled
if: false
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
needs: build-package

steps:
Expand All @@ -47,7 +47,7 @@ jobs:

publish-pypi:
name: Publish release to pypi.org
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
needs: build-package
# disabled as of now
if: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-transforms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build-images:
name: Build and check images
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -23,7 +23,7 @@ jobs:
name: Publish packages to quay.io
# disabled
if: false
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
needs: build-images

steps:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/test-code-code2parquet-kfp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
tags:
- "*"
paths:
- ".make.*"
- "transforms/.make.workflow"
- "transforms/code/code2parquet/**"
- "!kfp/**" # This is tested in separate workflow
- "!data-processing-lib/**" # This is tested in separate workflow
Expand All @@ -24,6 +26,8 @@ on:
- "dev"
- "releases/**"
paths:
- ".make.*"
- "transforms/.make.workflow"
- "transforms/code/code2parquet/**"
- "!data-processing-lib/**" # This is tested in separate workflow
- "!kfp/**" # This is tested in separate workflow
Expand All @@ -32,10 +36,9 @@ on:
- "!**/images/**"
- "!**.gitignore"


jobs:
test-kfp-v1:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -74,7 +77,7 @@ jobs:
echo "Run transforms/code/code2parquet completed"

test-kfp-v2:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -108,7 +111,7 @@ jobs:
export KFPv2=1
make -C $K8S_SETUP_SCRIPTS setup
make -C kfp/kfp_support_lib test
make -C transforms workflow-build
make -C transforms/code/code2parquet workflow-build
source $K8S_SETUP_SCRIPTS/common.sh
make -C transforms/code/code2parquet workflow-test
header_text "Run transforms/code/code2parquet completed"
10 changes: 7 additions & 3 deletions .github/workflows/test-code-code2parquet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
tags:
- "*"
paths:
- ".make.*"
- "transforms/.make.transforms"
- "transforms/code/code2parquet/**"
- "data-processing-lib/**"
- "!transforms/code/code2parquet/**/kfp_ray/**" # This is/will be tested in separate workflow
Expand All @@ -26,6 +28,8 @@ on:
- "dev"
- "releases/**"
paths:
- ".make.*"
- "transforms/.make.transforms"
- "transforms/code/code2parquet/**"
- "data-processing-lib/**"
- "!transforms/code/code2parquet/**/kfp_ray/**" # This is/will be tested in separate workflow
Expand All @@ -42,7 +46,7 @@ jobs:
# The images are pushed if it is a merge to dev branch or a new tag is created.
# The latter being part of the release process.
# The images tag is derived from the value of the DOCKER_IMAGE_VERSION variable set in the .make.versions file.
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
publish_images: ${{ steps.version.outputs.publish_images }}
steps:
Expand All @@ -59,7 +63,7 @@ jobs:
fi
echo "publish_images=$publish_images" >> "$GITHUB_OUTPUT"
test-src:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -81,7 +85,7 @@ jobs:
fi
test-image:
needs: [check_if_push_image]
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 120
env:
DOCKER_REGISTRY_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/test-code-code_quality-kfp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
tags:
- "*"
paths:
- ".make.*"
- "transforms/.make.workflow"
- "transforms/code/code_quality/**"
- "!kfp/**" # This is tested in separate workflow
- "!data-processing-lib/**" # This is tested in separate workflow
Expand All @@ -24,6 +26,8 @@ on:
- "dev"
- "releases/**"
paths:
- ".make.*"
- "transforms/.make.workflow"
- "transforms/code/code_quality/**"
- "!data-processing-lib/**" # This is tested in separate workflow
- "!kfp/**" # This is tested in separate workflow
Expand All @@ -32,10 +36,9 @@ on:
- "!**/images/**"
- "!**.gitignore"


jobs:
test-kfp-v1:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -74,7 +77,7 @@ jobs:
echo "Run transforms/code/code_quality completed"

test-kfp-v2:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -108,7 +111,7 @@ jobs:
export KFPv2=1
make -C $K8S_SETUP_SCRIPTS setup
make -C kfp/kfp_support_lib test
make -C transforms workflow-build
make -C transforms/code/code_quality workflow-build
source $K8S_SETUP_SCRIPTS/common.sh
make -C transforms/code/code_quality workflow-test
header_text "Run transforms/code/code_quality completed"
10 changes: 7 additions & 3 deletions .github/workflows/test-code-code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
tags:
- "*"
paths:
- ".make.*"
- "transforms/.make.transforms"
- "transforms/code/code_quality/**"
- "data-processing-lib/**"
- "!transforms/code/code_quality/**/kfp_ray/**" # This is/will be tested in separate workflow
Expand All @@ -26,6 +28,8 @@ on:
- "dev"
- "releases/**"
paths:
- ".make.*"
- "transforms/.make.transforms"
- "transforms/code/code_quality/**"
- "data-processing-lib/**"
- "!transforms/code/code_quality/**/kfp_ray/**" # This is/will be tested in separate workflow
Expand All @@ -42,7 +46,7 @@ jobs:
# The images are pushed if it is a merge to dev branch or a new tag is created.
# The latter being part of the release process.
# The images tag is derived from the value of the DOCKER_IMAGE_VERSION variable set in the .make.versions file.
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
publish_images: ${{ steps.version.outputs.publish_images }}
steps:
Expand All @@ -59,7 +63,7 @@ jobs:
fi
echo "publish_images=$publish_images" >> "$GITHUB_OUTPUT"
test-src:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -81,7 +85,7 @@ jobs:
fi
test-image:
needs: [check_if_push_image]
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 120
env:
DOCKER_REGISTRY_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/test-code-header_cleanser-kfp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
tags:
- "*"
paths:
- ".make.*"
- "transforms/.make.workflow"
- "transforms/code/header_cleanser/**"
- "!kfp/**" # This is tested in separate workflow
- "!data-processing-lib/**" # This is tested in separate workflow
Expand All @@ -24,6 +26,8 @@ on:
- "dev"
- "releases/**"
paths:
- ".make.*"
- "transforms/.make.workflow"
- "transforms/code/header_cleanser/**"
- "!data-processing-lib/**" # This is tested in separate workflow
- "!kfp/**" # This is tested in separate workflow
Expand All @@ -32,10 +36,9 @@ on:
- "!**/images/**"
- "!**.gitignore"


jobs:
test-kfp-v1:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -74,7 +77,7 @@ jobs:
echo "Run transforms/code/header_cleanser completed"

test-kfp-v2:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -108,7 +111,7 @@ jobs:
export KFPv2=1
make -C $K8S_SETUP_SCRIPTS setup
make -C kfp/kfp_support_lib test
make -C transforms workflow-build
make -C transforms/code/header_cleanser workflow-build
source $K8S_SETUP_SCRIPTS/common.sh
make -C transforms/code/header_cleanser workflow-test
header_text "Run transforms/code/header_cleanser completed"
10 changes: 7 additions & 3 deletions .github/workflows/test-code-header_cleanser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
tags:
- "*"
paths:
- ".make.*"
- "transforms/.make.transforms"
- "transforms/code/header_cleanser/**"
- "data-processing-lib/**"
- "!transforms/code/header_cleanser/**/kfp_ray/**" # This is/will be tested in separate workflow
Expand All @@ -26,6 +28,8 @@ on:
- "dev"
- "releases/**"
paths:
- ".make.*"
- "transforms/.make.transforms"
- "transforms/code/header_cleanser/**"
- "data-processing-lib/**"
- "!transforms/code/header_cleanser/**/kfp_ray/**" # This is/will be tested in separate workflow
Expand All @@ -42,7 +46,7 @@ jobs:
# The images are pushed if it is a merge to dev branch or a new tag is created.
# The latter being part of the release process.
# The images tag is derived from the value of the DOCKER_IMAGE_VERSION variable set in the .make.versions file.
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
publish_images: ${{ steps.version.outputs.publish_images }}
steps:
Expand All @@ -59,7 +63,7 @@ jobs:
fi
echo "publish_images=$publish_images" >> "$GITHUB_OUTPUT"
test-src:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -81,7 +85,7 @@ jobs:
fi
test-image:
needs: [check_if_push_image]
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 120
env:
DOCKER_REGISTRY_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
Expand Down
Loading
Loading