Skip to content

Commit b46f550

Browse files
zvonandzvonand
authored
Merge branch 'antalya' into oauth-to-edge
2 parents 0e209fe + 4e6c6ad commit b46f550

File tree

5 files changed

+23
-129
lines changed

5 files changed

+23
-129
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ tests/ci/cancel_and_rerun_workflow_lambda/app.py
3030
- [ ] <!---ci_exclude_stateless--> Stateless tests
3131
- [ ] <!---ci_exclude_stateful--> Stateful tests
3232
- [ ] <!---ci_exclude_performance--> Performance tests
33-
- [ ] <!---ci_exclude_asan--> All with ASAN
34-
- [ ] <!---ci_exclude_tsan--> All with TSAN
35-
- [ ] <!---ci_exclude_msan--> All with MSAN
36-
- [ ] <!---ci_exclude_ubsan--> All with UBSAN
33+
- [x] <!---ci_exclude_asan--> All with ASAN
34+
- [x] <!---ci_exclude_tsan--> All with TSAN
35+
- [x] <!---ci_exclude_msan--> All with MSAN
36+
- [x] <!---ci_exclude_ubsan--> All with UBSAN
3737
- [ ] <!---ci_exclude_coverage--> All with Coverage
3838
- [ ] <!---ci_exclude_aarch64--> All with Aarch64
39-
- [ ] <!---ci_exclude_regression--> All Regression
39+
- [x] <!---ci_exclude_regression--> All Regression
4040
- [ ] <!---no_ci_cache--> Disable CI Cache

‎.github/workflows/sign_and_release.yml‎

Lines changed: 14 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -239,110 +239,6 @@ jobs:
239239
version: 2
240240
arch: amd64
241241

242-
# - name: Download signed hash artifacts
243-
# run: |
244-
# run_id=$(echo "${{ inputs.workflow_url }}" | grep -oE '[0-9]+$')
245-
# mkdir -p signed-hashes/amd64 signed-hashes/arm64
246-
247-
# # Download AMD64 hashes
248-
# artifact_id=$(curl -s \
249-
# -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
250-
# -H "Accept: application/vnd.github.v3+json" \
251-
# "https://api.github.com/repos/Altinity/ClickHouse/actions/runs/$run_id/artifacts?per_page=1000" \
252-
# | jq -r --arg NAME "Sign release signed-hashes" '.artifacts[] | select(.name == $NAME) | .id')
253-
# if [ -z "$artifact_id" ] || [ "$artifact_id" == "null" ]; then
254-
# echo "Error: Could not find artifact 'Sign release signed-hashes' for run $run_id"
255-
# exit 1
256-
# fi
257-
# if ! curl -L \
258-
# -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
259-
# -H "Accept: application/vnd.github.v3+json" \
260-
# -o "signed-hashes/amd64/hashes.zip" \
261-
# "https://api.github.com/repos/Altinity/ClickHouse/actions/artifacts/$artifact_id/zip"; then
262-
# echo "Error: Failed to download AMD64 hashes"
263-
# exit 1
264-
# fi
265-
# unzip -o "signed-hashes/amd64/hashes.zip" -d signed-hashes/amd64
266-
267-
# # Download ARM64 hashes
268-
# artifact_id=$(curl -s \
269-
# -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
270-
# -H "Accept: application/vnd.github.v3+json" \
271-
# "https://api.github.com/repos/Altinity/ClickHouse/actions/runs/$run_id/artifacts?per_page=1000" \
272-
# | jq -r --arg NAME "Sign aarch64 signed-hashes" '.artifacts[] | select(.name == $NAME) | .id')
273-
# if [ -z "$artifact_id" ] || [ "$artifact_id" == "null" ]; then
274-
# echo "Error: Could not find artifact 'Sign aarch64 signed-hashes' for run $run_id"
275-
# exit 1
276-
# fi
277-
# if ! curl -L \
278-
# -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
279-
# -H "Accept: application/vnd.github.v3+json" \
280-
# -o "signed-hashes/arm64/hashes.zip" \
281-
# "https://api.github.com/repos/Altinity/ClickHouse/actions/artifacts/$artifact_id/zip"; then
282-
# echo "Error: Failed to download ARM64 hashes"
283-
# exit 1
284-
# fi
285-
# unzip -o "signed-hashes/arm64/hashes.zip" -d signed-hashes/arm64
286-
287-
# - name: Download packages for verification
288-
# run: |
289-
# # Create temporary directories for downloaded packages
290-
# mkdir -p /tmp/arm_packages /tmp/amd_packages
291-
292-
# # Download ARM packages
293-
# echo "Downloading ARM packages for verification..."
294-
# if ! aws s3 sync "${SRC_URL}/package_aarch64/" /tmp/arm_packages; then
295-
# echo "Failed to download ARM packages"
296-
# exit 1
297-
# fi
298-
299-
# # Download AMD packages
300-
# echo "Downloading AMD packages for verification..."
301-
# if ! aws s3 sync "${SRC_URL}/package_release/" /tmp/amd_packages; then
302-
# echo "Failed to download AMD packages"
303-
# exit 1
304-
# fi
305-
306-
# - name: Verify ARM packages
307-
# run: |
308-
# cd signed-hashes/arm64
309-
# # Verify all files
310-
# find /tmp/arm_packages -type f | while read -r file; do
311-
# if [ -f "$file" ]; then
312-
# file_name=$(basename "$file")
313-
# echo "Verifying $file_name..."
314-
315-
# if ! gpg --verify "$file_name.sha256.gpg" 2>/dev/null; then
316-
# echo "GPG verification failed for $file_name"
317-
# exit 1
318-
# fi
319-
# if ! sha256sum -c "$file_name.sha256.gpg" 2>/dev/null; then
320-
# echo "SHA256 verification failed for $file_name"
321-
# exit 1
322-
# fi
323-
# fi
324-
# done
325-
326-
# - name: Verify AMD packages
327-
# run: |
328-
# cd signed-hashes/amd64
329-
# # Verify all files
330-
# find /tmp/amd_packages -type f | while read -r file; do
331-
# if [ -f "$file" ]; then
332-
# file_name=$(basename "$file")
333-
# echo "Verifying $file_name..."
334-
335-
# if ! gpg --verify "$file_name.sha256.gpg" 2>/dev/null; then
336-
# echo "GPG verification failed for $file_name"
337-
# exit 1
338-
# fi
339-
# if ! sha256sum -c "$file_name.sha256.gpg" 2>/dev/null; then
340-
# echo "SHA256 verification failed for $file_name"
341-
# exit 1
342-
# fi
343-
# fi
344-
# done
345-
346242
- name: Move verified packages to destination
347243
run: |
348244
# Move ARM packages
@@ -423,19 +319,19 @@ jobs:
423319
exit 1
424320
fi
425321
426-
# publish-docker:
427-
# needs: extract-package-info
428-
# strategy:
429-
# matrix:
430-
# image_type: [server, keeper]
431-
# variant: ['', '-alpine']
432-
# uses: ./.github/workflows/docker_publish.yml
433-
# with:
434-
# docker_image: altinityinfra/clickhouse-${{ matrix.image_type }}:${{ needs.extract-package-info.outputs.docker_version }}${{ matrix.variant }}
435-
# release_environment: ${{ inputs.release_environment }}
436-
# upload_artifacts: false
437-
# s3_upload_path: "${{ needs.extract-package-info.outputs.dest_url }}/docker_images/${{ matrix.image_type }}${{ matrix.variant }}/"
438-
# secrets: inherit
322+
publish-docker:
323+
needs: extract-package-info
324+
strategy:
325+
matrix:
326+
image_type: [server, keeper]
327+
variant: ['', '-alpine']
328+
uses: ./.github/workflows/docker_publish.yml
329+
with:
330+
docker_image: altinityinfra/clickhouse-${{ matrix.image_type }}:${{ needs.extract-package-info.outputs.docker_version }}${{ matrix.variant }}
331+
release_environment: ${{ inputs.release_environment }}
332+
upload_artifacts: false
333+
s3_upload_path: "${{ needs.extract-package-info.outputs.dest_url }}/docker_images/${{ matrix.image_type }}${{ matrix.variant }}/"
334+
secrets: inherit
439335

440336
sign-and-publish:
441337
needs: [extract-package-info, copy-packages]
@@ -570,7 +466,7 @@ jobs:
570466
uses: Altinity/ClickHouse/.github/workflows/repo-sanity-checks.yml@antalya
571467

572468
copy-to-released:
573-
needs: [sign-and-publish]
469+
needs: [extract-package-info, sign-and-publish]
574470
if: ${{ inputs.release_environment == 'production' }}
575471
runs-on: [altinity-style-checker-aarch64, altinity-on-demand]
576472
env:

‎tests/ci/release/packaging/ansible/roles/update_deb_repo/tasks/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
- name: Export GPG public key to repo
6363
shell: "gpg --export --armor '{{ gpg_key_name }}' > '{{ local_repo_path }}/{{ repo_prefix }}apt-repo/pubkey.gpg'"
6464

65-
- name: Sync repos between source and target
66-
shell: "aws s3 sync --delete '{{ local_repo_path }}/{{ item }}' '{{ s3_repo_target_path }}/{{ release_environment }}/{{ item }}'"
65+
- name: Sync apt repos between source and target
66+
shell: "aws s3 sync '{{ local_repo_path }}/{{ item }}' '{{ s3_repo_target_path }}/{{ item }}'"
6767
loop: "{{ apt_repos }}"
6868
when: cloudfront_origin_path != ""

‎tests/ci/release/packaging/ansible/roles/update_deb_repo/templates/apt-ftparchive.conf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Dir {
22
ArchiveDir "{{ local_repo_path }}/{{ repo_prefix }}apt-repo";
3-
CacheDir "{{ local_repo_path }}/apt";
4-
FileListDir "{{ local_repo_path }}/apt/filelists";
53
};
64
Default {
75
Packages::Compress ". gzip bzip2";

‎tests/ci/release/packaging/ansible/roles/update_rpm_repo/tasks/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
src: "repo.j2"
4646
dest: "{{ local_repo_path }}/{{ repo_prefix }}yum-repo/{{ repo_name }}.repo"
4747

48-
- name: Sync repos between source and target
49-
shell: 'aws s3 sync --delete "{{ local_repo_path }}/{{ item }}" "{{ s3_repo_target_path }}/{{ release_environment }}/{{ item }}"'
48+
- name: Sync yum repos between source and target
49+
shell: 'aws s3 sync "{{ local_repo_path }}/{{ item }}" "{{ s3_repo_target_path }}/{{ item }}"'
5050
loop: "{{ yum_repos }}"
5151
when: cloudfront_origin_path != ""

0 commit comments

Comments
 (0)