From 6e10ab35daf6d33055f09f6ffe16f2b5ae8aca7f Mon Sep 17 00:00:00 2001 From: "shankailun.skl" Date: Wed, 20 Sep 2023 16:30:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=86=E4=BB=93=E5=BA=93=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPLICATION/grafana/buildspec.yml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/APPLICATION/grafana/buildspec.yml b/APPLICATION/grafana/buildspec.yml index 0ba184b..8ee6248 100644 --- a/APPLICATION/grafana/buildspec.yml +++ b/APPLICATION/grafana/buildspec.yml @@ -12,8 +12,12 @@ repository_info: # 定义镜像测试信息 t-one: # 配置测试信息 workspace 和模版 - workspace: &WORKSPACE common_workspace - template: &TEMPLATE huangxing-container-test + workspace: &WORKSPACE container_ci_test + project: &PROJECT default_container_ci_test + test_suite: &TEST_SUITE image-ci-test + test_conf: &TEST_CONF group=language_container + test_case: &TEST_CASE golang_language_container + cloud_server_tag: &CLOUD_SERVER_TAG [anolis-container-ci-x86, anolis-container-ci-arm] # 构建镜像配置 images: @@ -23,9 +27,21 @@ images: build: true docker_file: path: APPLICATION/grafana/7.5.11/8.6/Dockerfile + variable: + - &A86 [ (BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.6), (GOLANG_VERSION, "1.19.10"), (IMAGE_TAG, "1.19.10-8.6") ] + - &A88 [ (BASE_OS, registry.openanolis.cn/openanolis/anolisos:8.8), (GOLANG_VERSION, "1.19.10"), (IMAGE_TAG, "1.19.10-8.8") ] + - &A3 [ (BASE_OS, alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3), (GOLANG_VERSION, "1.19.10"), (IMAGE_TAG, "1.19.10-3") ] + - &A23 [ (BASE_OS, registry.openanolis.cn/openanolis/anolisos:23), (GOLANG_VERSION, "1.20.5"), (IMAGE_TAG, "1.20.5-23") ] scene: - args: [ ] - tags: [ [ 7.5.11-8.6, 7.5.11-8.6-nydus ] ] - registry: [ [ *ACR_PROD ] ] - # 测试配置 - test_config: [*WORKSPACE, *TEMPLATE] \ No newline at end of file + args: [ *A86, *A88, *A3, *A23 ] + tags: + - [ "1.19.10-8.6", "1.19-8.6" ] + - [ "1.19.10-8.8", "1.19-8.8", "1.19.10", "1.19" ] + - [ "1.19.10-3", "1.19-3" ] + - [ "1.20.5-23", "1.20.5", "1.20", "latest" ] + registry: [ *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD ] + test_config: + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] \ No newline at end of file -- Gitee From d721b6173b27d33b8c4a952069d549f4781baa61 Mon Sep 17 00:00:00 2001 From: "shankailun.skl" Date: Wed, 20 Sep 2023 16:35:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=86=E4=BB=93=E5=BA=93=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPLICATION/grafana/buildspec.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/APPLICATION/grafana/buildspec.yml b/APPLICATION/grafana/buildspec.yml index 8ee6248..efc21b3 100644 --- a/APPLICATION/grafana/buildspec.yml +++ b/APPLICATION/grafana/buildspec.yml @@ -34,14 +34,14 @@ images: - &A23 [ (BASE_OS, registry.openanolis.cn/openanolis/anolisos:23), (GOLANG_VERSION, "1.20.5"), (IMAGE_TAG, "1.20.5-23") ] scene: args: [ *A86, *A88, *A3, *A23 ] - tags: - - [ "1.19.10-8.6", "1.19-8.6" ] - - [ "1.19.10-8.8", "1.19-8.8", "1.19.10", "1.19" ] - - [ "1.19.10-3", "1.19-3" ] - - [ "1.20.5-23", "1.20.5", "1.20", "latest" ] - registry: [ *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD ] - test_config: - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] \ No newline at end of file + tags: + - [ "1.19.10-8.6", "1.19-8.6" ] + - [ "1.19.10-8.8", "1.19-8.8", "1.19.10", "1.19" ] + - [ "1.19.10-3", "1.19-3" ] + - [ "1.20.5-23", "1.20.5", "1.20", "latest" ] + registry: [ *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD ] + test_config: + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] + - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] \ No newline at end of file -- Gitee From dd54a8296ef2047237e3216be0ae512c6b93f7c0 Mon Sep 17 00:00:00 2001 From: "shankailun.skl" Date: Wed, 20 Sep 2023 16:45:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=86=E4=BB=93=E5=BA=93=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPLICATION/grafana/buildspec.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/APPLICATION/grafana/buildspec.yml b/APPLICATION/grafana/buildspec.yml index efc21b3..d3b2efb 100644 --- a/APPLICATION/grafana/buildspec.yml +++ b/APPLICATION/grafana/buildspec.yml @@ -41,7 +41,7 @@ images: - [ "1.20.5-23", "1.20.5", "1.20", "latest" ] registry: [ *ACR_PROD, *ACR_PROD, *ACR_PROD, *ACR_PROD ] test_config: - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] - - [ (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 0 ], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[ 1 ], '') ] \ No newline at end of file + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '') ] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '') ] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '') ] + - [(*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''), (*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[1], '') ] \ No newline at end of file -- Gitee From e608203ac94f815540bf67c8449ea1eee2a5da94 Mon Sep 17 00:00:00 2001 From: "shankailun.skl" Date: Fri, 13 Oct 2023 18:49:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=86=E4=BB=93=E5=BA=93=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPLICATION/grafana/buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APPLICATION/grafana/buildspec.yml b/APPLICATION/grafana/buildspec.yml index d3b2efb..c1d0303 100644 --- a/APPLICATION/grafana/buildspec.yml +++ b/APPLICATION/grafana/buildspec.yml @@ -15,7 +15,7 @@ t-one: workspace: &WORKSPACE container_ci_test project: &PROJECT default_container_ci_test test_suite: &TEST_SUITE image-ci-test - test_conf: &TEST_CONF group=language_container + test_conf: &TEST_CONF [group=language_container, group=language_container] test_case: &TEST_CASE golang_language_container cloud_server_tag: &CLOUD_SERVER_TAG [anolis-container-ci-x86, anolis-container-ci-arm] -- Gitee From d0c6f8f48fec81941f9c836ef5dda35b1294c61c Mon Sep 17 00:00:00 2001 From: "shankailun.skl" Date: Fri, 13 Oct 2023 19:01:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E4=BB=93=E5=BA=93=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPLICATION/grafana/buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APPLICATION/grafana/buildspec.yml b/APPLICATION/grafana/buildspec.yml index c1d0303..3ac72a5 100644 --- a/APPLICATION/grafana/buildspec.yml +++ b/APPLICATION/grafana/buildspec.yml @@ -17,7 +17,7 @@ t-one: test_suite: &TEST_SUITE image-ci-test test_conf: &TEST_CONF [group=language_container, group=language_container] test_case: &TEST_CASE golang_language_container - cloud_server_tag: &CLOUD_SERVER_TAG [anolis-container-ci-x86, anolis-container-ci-arm] + cloud_server_tag: &CLOUD_SERVER_TAG [[anolis-container-ci-x86, anolis-container-ci-arm], [anolis-container-ci-x86, anolis-container-ci-arm]] # 构建镜像配置 images: -- Gitee From e33cfb3f2c5c4b1fa7e34b652deaf952ee9af049 Mon Sep 17 00:00:00 2001 From: "shankailun.skl" Date: Fri, 13 Oct 2023 19:03:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=86=E4=BB=93=E5=BA=93=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPLICATION/grafana/buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APPLICATION/grafana/buildspec.yml b/APPLICATION/grafana/buildspec.yml index 3ac72a5..517cb96 100644 --- a/APPLICATION/grafana/buildspec.yml +++ b/APPLICATION/grafana/buildspec.yml @@ -16,7 +16,7 @@ t-one: project: &PROJECT default_container_ci_test test_suite: &TEST_SUITE image-ci-test test_conf: &TEST_CONF [group=language_container, group=language_container] - test_case: &TEST_CASE golang_language_container + test_case: &TEST_CASE [golang_language_container, golang_language_container] cloud_server_tag: &CLOUD_SERVER_TAG [[anolis-container-ci-x86, anolis-container-ci-arm], [anolis-container-ci-x86, anolis-container-ci-arm]] # 构建镜像配置 -- Gitee