From 4c4d9c232cc3951d3242095c7b39b8cf8f8d61e0 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 21 Jan 2025 09:42:35 +0100 Subject: feat(cdash): Move to new buckets Signed-off-by: Peter Mikus Change-Id: I5eaeaa44c5ad0cf0affe48436d886d146db8d8c9 --- csit.infra.dash/app/cdash/data/data.yaml | 38 +++++++++++----------- .../versions.tf | 4 +-- .../terraform-aws-fdio-csit-dash-env/main.tf | 10 +++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/csit.infra.dash/app/cdash/data/data.yaml b/csit.infra.dash/app/cdash/data/data.yaml index acf32c93f7..c1aa0bfd87 100644 --- a/csit.infra.dash/app/cdash/data/data.yaml +++ b/csit.infra.dash/app/cdash/data/data.yaml @@ -1,7 +1,7 @@ - data_type: statistics partition: stats_type partition_name: sra - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/stats + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/stats schema: statistics columns: - job @@ -11,7 +11,7 @@ - data_type: trending partition: test_type partition_name: mrr - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/trending + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/trending schema: trending_mrr columns: - job @@ -36,7 +36,7 @@ - data_type: trending partition: test_type partition_name: ndrpdr - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/trending + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/trending schema: trending_ndrpdr columns: - job @@ -71,7 +71,7 @@ - data_type: trending partition: test_type partition_name: hoststack - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/trending + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/trending schema: trending_hoststack columns: - job @@ -94,7 +94,7 @@ - data_type: trending partition: test_type partition_name: soak - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/trending + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/trending schema: trending_soak columns: - job @@ -116,7 +116,7 @@ partition: test_type partition_name: mrr release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 schema: iterative_rls2406_mrr columns: - job @@ -139,7 +139,7 @@ partition: test_type partition_name: ndrpdr release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 schema: iterative_rls2406_ndrpdr columns: - job @@ -174,7 +174,7 @@ partition: test_type partition_name: hoststack release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 schema: iterative_rls2406_hoststack columns: - job @@ -195,7 +195,7 @@ partition: test_type partition_name: soak release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2406 schema: iterative_rls2406_soak columns: - job @@ -217,7 +217,7 @@ partition: test_type partition_name: ndrpdr release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/coverage_rls2406 schema: coverage_rls2406_ndrpdr columns: - job @@ -244,7 +244,7 @@ partition: test_type partition_name: mrr release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/coverage_rls2406 schema: iterative_rls2406_mrr columns: - job @@ -263,7 +263,7 @@ partition: test_type partition_name: device release: rls2406 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2406 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/coverage_rls2406 schema: coverage_rls2406_device columns: - job @@ -278,7 +278,7 @@ partition: test_type partition_name: mrr release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 schema: iterative_rls2410_mrr columns: - job @@ -301,7 +301,7 @@ partition: test_type partition_name: ndrpdr release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 schema: iterative_rls2410_ndrpdr columns: - job @@ -336,7 +336,7 @@ partition: test_type partition_name: hoststack release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 schema: iterative_rls2410_hoststack columns: - job @@ -357,7 +357,7 @@ partition: test_type partition_name: soak release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/iterative_rls2410 schema: iterative_rls2410_soak columns: - job @@ -379,7 +379,7 @@ partition: test_type partition_name: ndrpdr release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/coverage_rls2410 schema: coverage_rls2410_ndrpdr columns: - job @@ -406,7 +406,7 @@ partition: test_type partition_name: mrr release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/coverage_rls2410 schema: iterative_rls2410_mrr columns: - job @@ -425,7 +425,7 @@ partition: test_type partition_name: device release: rls2410 - path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2410 + path: s3://csit-docs-s3-cloudfront-index/csit/parquet/coverage_rls2410 schema: coverage_rls2410_device columns: - job diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf index cd4761e34c..95a01e3a64 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf @@ -2,10 +2,10 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.31.0" + version = ">= 5.84.0" } vault = { - version = ">= 3.23.0" + version = ">= 4.6.0" } } required_version = ">= 1.4.2" diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf index 431d679fee..53413c55dc 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf @@ -1,6 +1,6 @@ -data "vault_kv_secret_v2" "fdio_docs" { +data "vault_kv_secret_v2" "csit_docs" { mount = "kv" - name = "etl/fdio_docs" + name = "etl/csit_docs" } data "vault_aws_access_credentials" "creds" { @@ -118,8 +118,8 @@ module "elastic_beanstalk_environment" { # aws:elasticbeanstalk:application:environment environment_variables = { - "AWS_ACCESS_KEY_ID" = data.vault_kv_secret_v2.fdio_docs.data["access_key"] - "AWS_SECRET_ACCESS_KEY" = data.vault_kv_secret_v2.fdio_docs.data["secret_key"] - "AWS_DEFAULT_REGION" = data.vault_kv_secret_v2.fdio_docs.data["region"] + "AWS_ACCESS_KEY_ID" = data.vault_kv_secret_v2.csit_docs.data["access_key"] + "AWS_SECRET_ACCESS_KEY" = data.vault_kv_secret_v2.csit_docs.data["secret_key"] + "AWS_DEFAULT_REGION" = data.vault_kv_secret_v2.csit_docs.data["region"] } } -- cgit