Skip to content

Revert "chore: migrate CI from spiral AWS account to vortex" #6800

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

Closed
joseph-isaacs wants to merge 1 commit into from
Closed

Revert "chore: migrate CI from spiral AWS account to vortex" #6800

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
4 changes: 2 additions & 2 deletions .github/runs-on.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ images:
platform: "linux"
arch: "x64"
name: "vortex-ci-*"
owner: "245040174862"
owner: "375504701696"
vortex-ci-arm64:
platform: "linux"
arch: "arm64"
name: "vortex-ci-*"
owner: "245040174862"
owner: "375504701696"
4 changes: 2 additions & 2 deletions .github/workflows/bench-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
if: github.event.pull_request.head.repo.fork == false
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::245040174862:role/GitHubBenchmarkRole
role-to-assume: arn:aws:iam::375504701696:role/GitHubBenchmarkRole
aws-region: us-east-1

- name: Install uv
Expand All @@ -115,7 +115,7 @@ jobs:
| jq -r '.workflow_runs[].head_sha' \
)

python3 scripts/s3-download.py s3://vortex-ci-benchmark-results/data.json.gz data.json.gz --no-sign-request
python3 scripts/s3-download.py s3://vortex-benchmark-results-database/data.json.gz data.json.gz --no-sign-request
gzip -d -c data.json.gz | grep $base_commit_sha > base.json

echo '# Benchmarks: ${{ matrix.benchmark.name }}' > comment.md
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup AWS CLI
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::245040174862:role/GitHubBenchmarkRole
role-to-assume: arn:aws:iam::375504701696:role/GitHubBenchmarkRole
aws-region: us-east-1
- name: Upload Commit Metadata
shell: bash
Expand All @@ -29,7 +29,7 @@ jobs:

sudo apt-get update && sudo apt-get install -y jq
bash scripts/commit-json.sh > new-commit.json
bash scripts/cat-s3.sh vortex-ci-benchmark-results commits.json new-commit.json
bash scripts/cat-s3.sh vortex-benchmark-results-database commits.json new-commit.json

bench:
timeout-minutes: 120
Expand Down Expand Up @@ -94,13 +94,13 @@ jobs:
- name: Setup AWS CLI
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::245040174862:role/GitHubBenchmarkRole
role-to-assume: arn:aws:iam::375504701696:role/GitHubBenchmarkRole
aws-region: us-east-1

- name: Upload Benchmark Results
shell: bash
run: |
bash scripts/cat-s3.sh vortex-ci-benchmark-results data.json.gz results.json
bash scripts/cat-s3.sh vortex-benchmark-results-database data.json.gz results.json

- name: Alert incident.io
if: failure()
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
"subcommand": "tpch",
"name": "TPC-H SF=1 on S3",
"local_dir": "vortex-bench/data/tpch/1.0",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
"scale_factor": "1.0"
},
Expand All @@ -154,7 +154,7 @@ jobs:
"subcommand": "tpch",
"name": "TPC-H SF=10 on S3",
"local_dir": "vortex-bench/data/tpch/10.0",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
"scale_factor": "10.0"
},
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
"subcommand": "fineweb",
"name": "FineWeb S3",
"local_dir": "vortex-bench/data/fineweb",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/fineweb/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/fineweb/",
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
"subcommand": "tpch",
"name": "TPC-H on S3",
"local_dir": "vortex-bench/data/tpch/10.0",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
"targets": "datafusion:parquet,datafusion:vortex,duckdb:parquet,duckdb:vortex",
"scale_factor": "10.0"
},
Expand All @@ -62,7 +62,7 @@ jobs:
"subcommand": "tpch",
"name": "TPC-H on S3",
"local_dir": "vortex-bench/data/tpch/100.0",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/100.0/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/100.0/",
"targets": "datafusion:parquet,duckdb:parquet,duckdb:vortex",
"scale_factor": "100.0"
},
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/sql-benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
"subcommand": "tpch",
"name": "TPC-H SF=1 on S3",
"local_dir": "vortex-bench/data/tpch/1.0",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
"scale_factor": "1.0"
},
Expand All @@ -51,7 +51,7 @@ on:
"subcommand": "tpch",
"name": "TPC-H SF=10 on S3",
"local_dir": "vortex-bench/data/tpch/10.0",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
"scale_factor": "10.0"
},
Expand Down Expand Up @@ -81,7 +81,7 @@ on:
"subcommand": "fineweb",
"name": "FineWeb S3",
"local_dir": "vortex-bench/data/fineweb",
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/fineweb/",
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/fineweb/",
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
"scale_factor": "100"
},
Expand Down Expand Up @@ -161,14 +161,14 @@ jobs:
if: inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::245040174862:role/GitHubBenchmarkRole
role-to-assume: arn:aws:iam::375504701696:role/GitHubBenchmarkRole
aws-region: us-east-1

- name: Upload data
if: matrix.remote_storage != null && (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false)
shell: bash
env:
AWS_REGION: "us-east-1"
AWS_REGION: "eu-west-1"
run: |
aws s3 rm --recursive ${{ matrix.remote_storage }}
aws s3 cp --recursive ${{matrix.local_dir}} ${{ matrix.remote_storage }}
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
if: matrix.remote_storage != null && (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false)
shell: bash
env:
AWS_REGION: "us-east-1"
AWS_REGION: "eu-west-1"
OTEL_SERVICE_NAME: "vortex-bench"
OTEL_EXPORTER_OTLP_PROTOCOL: "http/protobuf"
OTEL_EXPORTER_OTLP_ENDPOINT: "${{ (inputs.mode != 'pr' || github.event.pull_request.head.repo.fork == false) && secrets.OTEL_EXPORTER_OTLP_ENDPOINT || '' }}"
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
| jq -r '.workflow_runs[].head_sha' \
)

python3 scripts/s3-download.py s3://vortex-ci-benchmark-results/data.json.gz data.json.gz --no-sign-request
python3 scripts/s3-download.py s3://vortex-benchmark-results-database/data.json.gz data.json.gz --no-sign-request
gzip -d -c data.json.gz | grep $base_commit_sha > base.json

echo '# Benchmarks: ${{ matrix.name }}' > comment.md
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
if: inputs.mode == 'develop'
shell: bash
run: |
bash scripts/cat-s3.sh vortex-ci-benchmark-results data.json.gz results.json
bash scripts/cat-s3.sh vortex-benchmark-results-database data.json.gz results.json

- name: Alert incident.io
if: failure() && inputs.mode == 'develop'
Expand Down
Loading