From 2d86e2bdb4eb626b075470bce9451553c99299d5 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 17 Dec 2025 13:51:38 -0500 Subject: [PATCH 1/4] update regression hash --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- ci/praktika/yaml_additional_templates.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 8929d9b3d35c..ce96de70328f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4178,7 +4178,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 8d2c6d2072771d450a47faca38966da7493821e1 + commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4190,7 +4190,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 8d2c6d2072771d450a47faca38966da7493821e1 + commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7d62740af09b..81075ddb2270 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4134,7 +4134,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 8d2c6d2072771d450a47faca38966da7493821e1 + commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4146,7 +4146,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 8d2c6d2072771d450a47faca38966da7493821e1 + commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index f92d704fd0f1..db2311a3e9f0 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -35,7 +35,7 @@ class AltinityWorkflowTemplates: echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY """ # Additional jobs - REGRESSION_HASH = "8d2c6d2072771d450a47faca38966da7493821e1" + REGRESSION_HASH = "6aa5cfbeebee408b131356e9a5f8848a4756c575" ALTINITY_JOBS = { "GrypeScan": r""" GrypeScanServer: From 338b4ba2391c4809628b697bf64256ea44901ff8 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 17 Dec 2025 13:36:21 -0500 Subject: [PATCH 2/4] Add new S3 export suites --- .github/workflows/regression.yml | 70 ++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 5275e2550003..3fcab1f8793e 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -1005,6 +1005,76 @@ jobs: name: ${{ env.SUITE }}-${{ matrix.STORAGE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts path: ${{ env.artifact_paths}} + S3Export: + if: | + fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null || + contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3') + strategy: + fail-fast: false + matrix: + PART: [part, partition] + needs: [runner_labels_setup] + runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }} + timeout-minutes: ${{ inputs.timeout_minutes }} + steps: + - name: Checkout regression repo + uses: actions/checkout@v4 + with: + repository: Altinity/clickhouse-regression + ref: ${{ inputs.commit }} + - name: Set envs + run: | + cat >> "$GITHUB_ENV" << 'EOF' + REPORTS_PATH=${{ runner.temp }}/reports_dir + SUITE=s3_export + PART=${{ matrix.PART }} + EOF + - name: Setup + run: .github/setup.sh + - name: Get deb url + env: + S3_BASE_URL: https://altinity-build-artifacts.s3.amazonaws.com/ + PR_NUMBER: ${{ github.event.pull_request.number || 0 }} + run: | + mkdir -p $REPORTS_PATH + cat > $REPORTS_PATH/workflow_config.json << 'EOF' + ${{ inputs.workflow_config }} + EOF + + python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary + + - name: Run ${{ env.SUITE }} suite + id: run_suite + run: EXITCODE=0; + python3 + -u ${{ env.SUITE }}/regression.py + --clickhouse-binary-path ${{ env.clickhouse_path }} + --storage minio + --attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$GITHUB_JOB (${{ matrix.PART }})" job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)" + --only ":/try*" "minio/export ${{ matrix.PART }}/*" + ${{ env.args }} || EXITCODE=$?; + .github/add_link_to_logs.sh; + exit $EXITCODE + - name: Set Commit Status + if: always() + run: python3 .github/set_builds_status.py + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JOB_OUTCOME: ${{ steps.run_suite.outcome }} + SUITE_NAME: "Regression ${{ inputs.arch }} S3 Export ${{ matrix.PART }}" + - name: Create and upload logs + if: always() + run: .github/create_and_upload_logs.sh 1 + - name: Upload logs to regression results database + if: always() + timeout-minutes: 20 + run: .github/upload_results_to_database.sh 1 + - uses: actions/upload-artifact@v4 + if: always() + with: + name: ${{ env.SUITE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts + path: ${{ env.artifact_paths}} + TieredStorage: if: | fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null || From 09d9347d0b56e44e4b7aa27e5b4f7eb88fafe14d Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 17 Dec 2025 14:24:21 -0500 Subject: [PATCH 3/4] fix s3 export regression path --- .github/workflows/regression.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 3fcab1f8793e..769de07bbd63 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -1026,7 +1026,7 @@ jobs: run: | cat >> "$GITHUB_ENV" << 'EOF' REPORTS_PATH=${{ runner.temp }}/reports_dir - SUITE=s3_export + SUITE=s3 PART=${{ matrix.PART }} EOF - name: Setup @@ -1051,7 +1051,7 @@ jobs: --clickhouse-binary-path ${{ env.clickhouse_path }} --storage minio --attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$GITHUB_JOB (${{ matrix.PART }})" job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)" - --only ":/try*" "minio/export ${{ matrix.PART }}/*" + --only ":/try*" "minio/export tests/export ${{ matrix.PART }}/*" ${{ env.args }} || EXITCODE=$?; .github/add_link_to_logs.sh; exit $EXITCODE @@ -1072,7 +1072,7 @@ jobs: - uses: actions/upload-artifact@v4 if: always() with: - name: ${{ env.SUITE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts + name: ${{ env.SUITE }}-export-${{ matrix.PART }}-${{ inputs.arch }}-artifacts path: ${{ env.artifact_paths}} TieredStorage: From 78093d7bc0a11663da6a0ea1835ce45322d4a72f Mon Sep 17 00:00:00 2001 From: CarlosFelipeOR Date: Tue, 23 Dec 2025 12:03:13 -0300 Subject: [PATCH 4/4] Update commit hash for antalya 25.8 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- ci/praktika/yaml_additional_templates.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ce96de70328f..03de9b53db98 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4178,7 +4178,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 + commit: bd9d71b4ccc80bb5b1a316b43b60f59c0c592898 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4190,7 +4190,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 + commit: bd9d71b4ccc80bb5b1a316b43b60f59c0c592898 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 81075ddb2270..03974cea3067 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4134,7 +4134,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester - commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 + commit: bd9d71b4ccc80bb5b1a316b43b60f59c0c592898 arch: release build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 @@ -4146,7 +4146,7 @@ jobs: secrets: inherit with: runner_type: altinity-on-demand, altinity-regression-tester-aarch64 - commit: 6aa5cfbeebee408b131356e9a5f8848a4756c575 + commit: bd9d71b4ccc80bb5b1a316b43b60f59c0c592898 arch: aarch64 build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index db2311a3e9f0..ed222a7dd0d1 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -35,7 +35,7 @@ class AltinityWorkflowTemplates: echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY """ # Additional jobs - REGRESSION_HASH = "6aa5cfbeebee408b131356e9a5f8848a4756c575" + REGRESSION_HASH = "bd9d71b4ccc80bb5b1a316b43b60f59c0c592898" ALTINITY_JOBS = { "GrypeScan": r""" GrypeScanServer: