From e0cda4d9f77ba75bd550b7d7778efe4399cc04ab Mon Sep 17 00:00:00 2001 From: Nadezhda Savchenko Date: Tue, 12 Nov 2024 11:31:12 +0300 Subject: [PATCH 1/3] Up test images to 23.2 vs 24.1 --- Makefile | 8 ++++---- pkg/testutil/spec_builders.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index dc405efd..92405e8c 100644 --- a/Makefile +++ b/Makefile @@ -208,16 +208,16 @@ kind-delete-local-registry: ## Delete local docker registry. rm -fr "${REGISTRY_CONFIG_DIR}/${REGISTRY_LOCAL_ADDR}" TEST_IMAGES = \ - ytsaurus/ytsaurus-nightly:dev-23.1-28ccaedbf353b870bedafb6e881ecf386a0a3779 \ - ytsaurus/ytsaurus-nightly:dev-23.1-9779e0140ff73f5a786bd5362313ef9a74fcd0de \ - ytsaurus/ytsaurus-nightly:dev-23.2-9c50056eacfa4fe213798a5b9ee828ae3acb1bca + ytsaurus/ytsaurus:stable-24.1.0 \ + ytsaurus/ytsaurus:stable-23.2.0 \ + ytsaurus/ytsaurus:stable-23.2.1 .PHONY: kind-load-test-images kind-load-test-images: $(foreach img,$(TEST_IMAGES),docker pull -q $(img) && $(KIND) load docker-image --name $(KIND_CLUSTER_NAME) $(img);) SAMPLE_IMAGES = \ - ytsaurus/ytsaurus:stable-23.1.0-relwithdebinfo + ytsaurus/ytsaurus:stable-24.1.0-relwithdebinfo .PHONY: kind-load-sample-images kind-load-sample-images: $(foreach img,$(SAMPLE_IMAGES),docker pull -q $(img) && $(KIND) load docker-image --name $(KIND_CLUSTER_NAME) $(img);) diff --git a/pkg/testutil/spec_builders.go b/pkg/testutil/spec_builders.go index 3fa1f131..1d6949a9 100644 --- a/pkg/testutil/spec_builders.go +++ b/pkg/testutil/spec_builders.go @@ -23,9 +23,9 @@ const ( RemoteResourceName = "tst-rmt" // Images should be in sync with TEST_IMAGES variable in Makefile // todo: come up with a more elegant solution - CoreImageFirst = "ytsaurus/ytsaurus-nightly:dev-23.1-9779e0140ff73f5a786bd5362313ef9a74fcd0de" - CoreImageSecond = "ytsaurus/ytsaurus-nightly:dev-23.1-28ccaedbf353b870bedafb6e881ecf386a0a3779" - CoreImageNextVer = "ytsaurus/ytsaurus-nightly:dev-23.2-9c50056eacfa4fe213798a5b9ee828ae3acb1bca" + CoreImageNextVer = "ytsaurus/ytsaurus:stable-24.1.0" + CoreImageFirst = "ytsaurus/ytsaurus:stable-23.2.0" + CoreImageSecond = "ytsaurus/ytsaurus:stable-23.2.1" ) var ( From b1d4d289d4c5d6a5a28c5832adf088db5847bc29 Mon Sep 17 00:00:00 2001 From: Nadezhda Savchenko Date: Tue, 12 Nov 2024 13:00:19 +0300 Subject: [PATCH 2/3] fix --- Makefile | 6 +++--- pkg/testutil/spec_builders.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 92405e8c..5dfff7df 100644 --- a/Makefile +++ b/Makefile @@ -208,9 +208,9 @@ kind-delete-local-registry: ## Delete local docker registry. rm -fr "${REGISTRY_CONFIG_DIR}/${REGISTRY_LOCAL_ADDR}" TEST_IMAGES = \ - ytsaurus/ytsaurus:stable-24.1.0 \ - ytsaurus/ytsaurus:stable-23.2.0 \ - ytsaurus/ytsaurus:stable-23.2.1 + ghcr.io/ytsaurus/ytsaurus:stable-24.1.0 \ + ghcr.io/ytsaurus/ytsaurus:stable-23.2.0 \ + ghcr.io/ytsaurus/ytsaurus:stable-23.2.1 .PHONY: kind-load-test-images kind-load-test-images: diff --git a/pkg/testutil/spec_builders.go b/pkg/testutil/spec_builders.go index 1d6949a9..63876b69 100644 --- a/pkg/testutil/spec_builders.go +++ b/pkg/testutil/spec_builders.go @@ -23,9 +23,9 @@ const ( RemoteResourceName = "tst-rmt" // Images should be in sync with TEST_IMAGES variable in Makefile // todo: come up with a more elegant solution - CoreImageNextVer = "ytsaurus/ytsaurus:stable-24.1.0" - CoreImageFirst = "ytsaurus/ytsaurus:stable-23.2.0" - CoreImageSecond = "ytsaurus/ytsaurus:stable-23.2.1" + CoreImageNextVer = "ghcr.io/ytsaurus/ytsaurus:stable-24.1.0" + CoreImageFirst = "ghcr.io/ytsaurus/ytsaurus:stable-23.2.0" + CoreImageSecond = "ghcr.io/ytsaurus/ytsaurus:stable-23.2.1" ) var ( From 66b99b9360aa90e9c1a57e6a3217992eb0d4b0d8 Mon Sep 17 00:00:00 2001 From: Nadezhda Savchenko Date: Tue, 12 Nov 2024 13:55:22 +0300 Subject: [PATCH 3/3] Fix sample --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5dfff7df..baed093b 100644 --- a/Makefile +++ b/Makefile @@ -217,7 +217,7 @@ kind-load-test-images: $(foreach img,$(TEST_IMAGES),docker pull -q $(img) && $(KIND) load docker-image --name $(KIND_CLUSTER_NAME) $(img);) SAMPLE_IMAGES = \ - ytsaurus/ytsaurus:stable-24.1.0-relwithdebinfo + ghcr.io/ytsaurus/ytsaurus:stable-24.1.0-relwithdebinfo .PHONY: kind-load-sample-images kind-load-sample-images: $(foreach img,$(SAMPLE_IMAGES),docker pull -q $(img) && $(KIND) load docker-image --name $(KIND_CLUSTER_NAME) $(img);)