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.

Sign up for GitHub

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

[CI] Miscellaneous CI Fixes #2218

Merged
merged 1 commit into from
Jul 22, 2024
Merged

[CI] Miscellaneous CI Fixes #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
- name: Install awscurl
working-directory: tests/integration
run: |
curl -OL https://github.com/frankfliu/junkyard/releases/download/v0.2.2/awscurl
wget https://publish.djl.ai/awscurl/awscurl
chmod +x awscurl
mkdir outputs
- name: Test
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/integration_execute.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
inputs:
test:
description: 'Which test to run as a pytest keyword expression. Should be a class in tests.py or TestClass::test_fun_name'
description: 'Which test to run as a pytest keyword expression. Can be a class in tests.py or "TestClass and test_fun_name"'
required: false
default: ""
mark:
Expand Down Expand Up @@ -38,6 +38,8 @@ jobs:
mode: temp
create-runners:
runs-on: [self-hosted, scheduler]
if: |
always() && (needs.build-temp.result == 'success' || needs.build-temp.result == 'skipped')
needs: [build-temp]
steps:
- name: Create new instance
Expand All @@ -56,6 +58,9 @@ jobs:
runs-on: [ self-hosted, "${{ needs.create-runners.outputs.label }}"]
timeout-minutes: 60
needs: [create-runners, build-temp]
if: |
always() && needs.create-runners.result == 'success' &&
(needs.build-temp.result == 'success' || needs.build-temp.result == 'skipped')
steps:
- uses: actions/checkout@v4
- name: Clean env
Expand Down Expand Up @@ -98,7 +103,7 @@ jobs:
- name: Install awscurl
working-directory: tests/integration
run: |
curl -OL https://github.com/frankfliu/junkyard/releases/download/v0.2.2/awscurl
wget https://publish.djl.ai/awscurl/awscurl
chmod +x awscurl
mkdir outputs
- name: Test
Expand Down
6 changes: 4 additions & 2 deletions tests/integration/llm/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,8 +846,10 @@ def awscurl_run(data,
if output:
output_path = os.path.join(os.path.curdir, "outputs", "output")
command = f"{command} -o {output_path}"
LOGGER.info(f"Running command {command}")
sp.call(command, shell=True)
logging.info(f"Running command {command}")
res = sp.run(command, shell=True, stdout=sp.PIPE, stderr=sp.PIPE)
if "error rate: 100" in res.stdout.decode("utf-8"):
raise ValueError("Found error result in awscurl_run")
if dataset:
shutil.rmtree(dataset_dir)

Expand Down
Loading