24.3.11 Docker test images for server and keeper

Based on PR #418
Altinity · Sep 26, 2024 · 7cdaee0 · 7cdaee0
1 parent 28795d0
commit 7cdaee0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
@@ -444,7 +444,7 @@ class TestConfig:
 # common test params
 docker_server_job_config = JobConfig(
     required_on_release_branch=True,
-    run_command='docker_server.py --check-name "$CHECK_NAME" --release-type head --allow-build-reuse',
+    run_command='docker_server.py --check-name "$CHECK_NAME" --release-type head --allow-build-reuse --push',
     digest=DigestConfig(
         include_paths=[
             "tests/ci/docker_server.py",
@@ -1239,8 +1239,7 @@ def validate(self) -> None:
         ),
         JobNames.INTEGRATION_TEST_ARM: TestConfig(
             Build.PACKAGE_AARCH64,
-            # add [run_by_label="test arm"] to not run in regular pr workflow by default
-            job_config=JobConfig(num_batches=6, **integration_test_common_params, run_by_label="test arm"),  # type: ignore
+            job_config=JobConfig(num_batches=6, **integration_test_common_params),  # type: ignore
         ),
         JobNames.INTEGRATION_TEST: TestConfig(
             Build.PACKAGE_RELEASE,

diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
@@ -60,7 +60,7 @@ def parse_args() -> argparse.Namespace:
         "--version",
         type=version_arg,
         default=get_version_from_repo(git=git).string,
-        help="a version to build, automaticaly got from version_helper, accepts either "
+        help="a version to build, automatically got from version_helper, accepts either "
         "tag ('refs/tags/' is removed automatically) or a normal 22.2.2.2 format",
     )
     parser.add_argument(
@@ -249,7 +249,7 @@ def build_and_push_image(
     init_args = ["docker", "buildx", "build"]
     if push:
         init_args.append("--push")
-        init_args.append("--output=type=image,push-by-digest=true")
+        init_args.append("--output=type=image")
         init_args.append(f"--tag={image.repo}")
     else:
         init_args.append("--output=type=docker")
@@ -368,6 +368,7 @@ def main():
     image = DockerImageData(image_path, image_repo, False)
     args.release_type = auto_release_type(args.version, args.release_type)
     tags = gen_tags(args.version, args.release_type)
+    tags.append(f'{pr_info.number}-{args.version}')
     repo_urls = {}
     direct_urls: Dict[str, List[str]] = {}
     release_or_pr, _ = get_release_or_pr(pr_info, args.version)