Skip to content

Commit b7b0fd9

Browse files
MyroTkMyroTk
committed
update build suffix and add hotfix to version helper
1 parent 4f3b2cd commit b7b0fd9

File tree

4 files changed

+29
-48
lines changed

4 files changed

+29
-48
lines changed

‎.github/workflows/regression.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
name: build_urls_package_${{ inputs.arch }}
169169
- name: Rename reports
170170
run: |
171-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
171+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
172172
- name: Setup
173173
run: .github/setup.sh
174174
- name: Get deb url
@@ -219,7 +219,7 @@ jobs:
219219
name: build_urls_package_${{ inputs.arch }}
220220
- name: Rename reports
221221
run: |
222-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
222+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
223223
- name: Setup
224224
run: .github/setup.sh
225225
- name: Get deb url
@@ -271,7 +271,7 @@ jobs:
271271
name: build_urls_package_${{ inputs.arch }}
272272
- name: Rename reports
273273
run: |
274-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
274+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
275275
- name: Setup
276276
run: .github/setup.sh
277277
- name: Get deb url
@@ -326,7 +326,7 @@ jobs:
326326
name: build_urls_package_${{ inputs.arch }}
327327
- name: Rename reports
328328
run: |
329-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
329+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
330330
- name: Setup
331331
run: .github/setup.sh
332332
- name: Get deb url
@@ -377,7 +377,7 @@ jobs:
377377
name: build_urls_package_${{ inputs.arch }}
378378
- name: Rename reports
379379
run: |
380-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
380+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
381381
- name: Setup
382382
run: .github/setup.sh
383383
- name: Get deb url
@@ -423,7 +423,7 @@ jobs:
423423
name: build_urls_package_${{ inputs.arch }}
424424
- name: Rename reports
425425
run: |
426-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
426+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
427427
- name: Setup
428428
run: .github/setup.sh
429429
- name: Get deb url
@@ -474,7 +474,7 @@ jobs:
474474
name: build_urls_package_${{ inputs.arch }}
475475
- name: Rename reports
476476
run: |
477-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
477+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
478478
- name: Setup
479479
run: .github/setup.sh
480480
- name: Get deb url
@@ -530,7 +530,7 @@ jobs:
530530
name: build_urls_package_${{ inputs.arch }}
531531
- name: Rename reports
532532
run: |
533-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
533+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
534534
- name: Setup
535535
run: .github/setup.sh
536536
- name: Get deb url
@@ -592,7 +592,7 @@ jobs:
592592
name: build_urls_package_${{ inputs.arch }}
593593
- name: Rename reports
594594
run: |
595-
mv ${{ env.REPORTS_PATH }}/build_report_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
595+
mv ${{ env.REPORTS_PATH }}/build_urls_package_*.json ${{ env.REPORTS_PATH }}/build_report_package_${{ inputs.arch }}.json
596596
- name: Setup
597597
run: .github/setup.sh
598598
- name: Get deb url

‎.github/workflows/release_branches.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
REPO_COPY=${{runner.temp}}/build_check/ClickHouse
135135
CACHES_PATH=${{runner.temp}}/../ccaches
136136
BUILD_NAME=package_release
137-
CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
137+
CLICKHOUSE_STABLE_VERSION_SUFFIX=altinityhotfix
138138
EOF
139139
- name: Download changed images
140140
uses: actions/download-artifact@v4

‎tests/ci/docker_images_check.py‎

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -106,43 +106,23 @@ def get_changed_docker_images(
106106
str(files_changed),
107107
)
108108

109-
# Find changed images
110-
all_images = []
111-
changed_images = []
112-
for dockerfile_dir, image_description in images_dict.items():
113-
all_images.append(DockerImage(dockerfile_dir, image_description["name"], image_description.get("only_amd64", False)))
114-
for f in files_changed:
115-
if f.startswith(dockerfile_dir):
116-
name = image_description["name"]
117-
only_amd64 = image_description.get("only_amd64", False)
118-
logging.info(
119-
"Found changed file '%s' which affects "
120-
"docker image '%s' with path '%s'",
121-
f,
122-
name,
123-
dockerfile_dir,
124-
)
125-
changed_images.append(DockerImage(dockerfile_dir, name, only_amd64))
126-
break
127-
128-
# Rebuild all images on push, release, or scheduled run
129-
if pr_info.number in [0,1]:
130-
changed_images = all_images
131-
132-
else:
133-
# Rebuild all on opened PR
134-
if pr_info.event['action'] in ['opened', 'reopened']:
135-
changed_images = all_images
136-
137-
# Check that image for the PR exists
138-
elif pr_info.event['action'] == 'synchronize':
139-
unchanged_images = [
140-
image for image in all_images if image not in changed_images
141-
]
142-
logging.info(f"Unchanged images: {unchanged_images}")
143-
for image in unchanged_images:
144-
if subprocess.run(f"docker manifest inspect {image.repo}:{pr_info.number}-amd64", shell=True).returncode != 0:
145-
changed_images.append(image)
109+
# Rebuild all images
110+
changed_images = [DockerImage(dockerfile_dir, image_description["name"], image_description.get("only_amd64", False)) for dockerfile_dir, image_description in images_dict.items()]
111+
112+
# for dockerfile_dir, image_description in images_dict.items():
113+
# for f in files_changed:
114+
# if f.startswith(dockerfile_dir):
115+
# name = image_description["name"]
116+
# only_amd64 = image_description.get("only_amd64", False)
117+
# logging.info(
118+
# "Found changed file '%s' which affects "
119+
# "docker image '%s' with path '%s'",
120+
# f,
121+
# name,
122+
# dockerfile_dir,
123+
# )
124+
# changed_images.append(DockerImage(dockerfile_dir, name, only_amd64))
125+
# break
146126

147127
# The order is important: dependents should go later than bases, so that
148128
# they are built with updated base versions.

‎tests/ci/version_helper.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ class VersionType:
175175
PRESTABLE = "prestable"
176176
STABLE = "altinitystable"
177177
TESTING = "testing"
178-
VALID = (TESTING, PRESTABLE, STABLE, LTS)
178+
HOTFIX = "altinityhotfix"
179+
VALID = (TESTING, PRESTABLE, STABLE, LTS, HOTFIX)
179180

180181

181182
def validate_version(version: str):

0 commit comments

Comments
 (0)