From d164bef0373edfd2b6cc7d4aaa27b928065df3e5 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 24 May 2023 13:12:36 +0000 Subject: [PATCH] feat(etl): 2306 Signed-off-by: pmikus Change-Id: I54e80bc78f6deb5d2774a2ddd7b3b4153ffb106b --- ...evice_rls2302.py => coverage_device_rls2306.py} | 4 +- ...ck_rls2302.py => coverage_hoststack_rls2306.py} | 4 +- ...rage_mrr_rls2302.py => coverage_mrr_rls2306.py} | 4 +- ...drpdr_rls2302.py => coverage_ndrpdr_rls2306.py} | 4 +- ...econf_rls2302.py => coverage_reconf_rls2306.py} | 4 +- ...ge_soak_rls2302.py => coverage_soak_rls2306.py} | 4 +- ...k_rls2302.py => iterative_hoststack_rls2306.py} | 4 +- ...ive_mrr_rls2302.py => iterative_mrr_rls2306.py} | 4 +- ...rpdr_rls2302.py => iterative_ndrpdr_rls2306.py} | 4 +- ...conf_rls2302.py => iterative_reconf_rls2306.py} | 4 +- ...e_soak_rls2302.py => iterative_soak_rls2306.py} | 4 +- ...tftpl => etl-coverage-device-rls2306.hcl.tftpl} | 2 +- ...pl => etl-coverage-hoststack-rls2306.hcl.tftpl} | 2 +- ...cl.tftpl => etl-coverage-mrr-rls2306.hcl.tftpl} | 2 +- ...tftpl => etl-coverage-ndrpdr-rls2306.hcl.tftpl} | 2 +- ...tftpl => etl-coverage-reconf-rls2306.hcl.tftpl} | 2 +- ...l.tftpl => etl-coverage-soak-rls2306.hcl.tftpl} | 2 +- ...l => etl-iterative-hoststack-rls2306.hcl.tftpl} | 2 +- ...l.tftpl => etl-iterative-mrr-rls2306.hcl.tftpl} | 2 +- ...ftpl => etl-iterative-ndrpdr-rls2306.hcl.tftpl} | 2 +- ...ftpl => etl-iterative-reconf-rls2306.hcl.tftpl} | 2 +- ....tftpl => etl-iterative-soak-rls2306.hcl.tftpl} | 2 +- .../terraform-nomad-pyspark-etl/fdio/main.tf | 44 +++++++++++----------- 23 files changed, 55 insertions(+), 55 deletions(-) rename csit.infra.etl/{coverage_device_rls2302.py => coverage_device_rls2306.py} (99%) rename csit.infra.etl/{coverage_hoststack_rls2302.py => coverage_hoststack_rls2306.py} (99%) rename csit.infra.etl/{coverage_mrr_rls2302.py => coverage_mrr_rls2306.py} (99%) rename csit.infra.etl/{coverage_ndrpdr_rls2302.py => coverage_ndrpdr_rls2306.py} (99%) rename csit.infra.etl/{coverage_reconf_rls2302.py => coverage_reconf_rls2306.py} (99%) rename csit.infra.etl/{coverage_soak_rls2302.py => coverage_soak_rls2306.py} (99%) rename csit.infra.etl/{iterative_hoststack_rls2302.py => iterative_hoststack_rls2306.py} (99%) rename csit.infra.etl/{iterative_mrr_rls2302.py => iterative_mrr_rls2306.py} (99%) rename csit.infra.etl/{iterative_ndrpdr_rls2302.py => iterative_ndrpdr_rls2306.py} (99%) rename csit.infra.etl/{iterative_reconf_rls2302.py => iterative_reconf_rls2306.py} (99%) rename csit.infra.etl/{iterative_soak_rls2302.py => iterative_soak_rls2306.py} (99%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-coverage-device-rls2302.hcl.tftpl => etl-coverage-device-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-coverage-hoststack-rls2302.hcl.tftpl => etl-coverage-hoststack-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-coverage-mrr-rls2302.hcl.tftpl => etl-coverage-mrr-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-coverage-reconf-rls2302.hcl.tftpl => etl-coverage-ndrpdr-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-coverage-ndrpdr-rls2302.hcl.tftpl => etl-coverage-reconf-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-coverage-soak-rls2302.hcl.tftpl => etl-coverage-soak-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-iterative-hoststack-rls2302.hcl.tftpl => etl-iterative-hoststack-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-iterative-mrr-rls2302.hcl.tftpl => etl-iterative-mrr-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-iterative-ndrpdr-rls2302.hcl.tftpl => etl-iterative-ndrpdr-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-iterative-reconf-rls2302.hcl.tftpl => etl-iterative-reconf-rls2306.hcl.tftpl} (97%) rename fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/{etl-iterative-soak-rls2302.hcl.tftpl => etl-iterative-soak-rls2306.hcl.tftpl} (97%) diff --git a/csit.infra.etl/coverage_device_rls2302.py b/csit.infra.etl/coverage_device_rls2306.py similarity index 99% rename from csit.infra.etl/coverage_device_rls2302.py rename to csit.infra.etl/coverage_device_rls2306.py index 7152f95b0a..2d4f59b29c 100644 --- a/csit.infra.etl/coverage_device_rls2302.py +++ b/csit.infra.etl/coverage_device_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-coverage-2302" in path] +filtered_paths = [path for path in paths if "report-coverage-2306" in path] out_sdf = process_json_to_dataframe("device", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/coverage_hoststack_rls2302.py b/csit.infra.etl/coverage_hoststack_rls2306.py similarity index 99% rename from csit.infra.etl/coverage_hoststack_rls2302.py rename to csit.infra.etl/coverage_hoststack_rls2306.py index 4ec286f679..9a5f7a5bc9 100644 --- a/csit.infra.etl/coverage_hoststack_rls2302.py +++ b/csit.infra.etl/coverage_hoststack_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-coverage-2302" in path] +filtered_paths = [path for path in paths if "report-coverage-2306" in path] out_sdf = process_json_to_dataframe("hoststack", filtered_paths) out_sdf.show(truncate=False) @@ -155,7 +155,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/coverage_mrr_rls2302.py b/csit.infra.etl/coverage_mrr_rls2306.py similarity index 99% rename from csit.infra.etl/coverage_mrr_rls2302.py rename to csit.infra.etl/coverage_mrr_rls2306.py index 7ed4c93e79..02ea40ef2b 100644 --- a/csit.infra.etl/coverage_mrr_rls2302.py +++ b/csit.infra.etl/coverage_mrr_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-coverage-2302" in path] +filtered_paths = [path for path in paths if "report-coverage-2306" in path] out_sdf = process_json_to_dataframe("mrr", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/coverage_ndrpdr_rls2302.py b/csit.infra.etl/coverage_ndrpdr_rls2306.py similarity index 99% rename from csit.infra.etl/coverage_ndrpdr_rls2302.py rename to csit.infra.etl/coverage_ndrpdr_rls2306.py index fd0f496b12..5987e3eaa1 100644 --- a/csit.infra.etl/coverage_ndrpdr_rls2302.py +++ b/csit.infra.etl/coverage_ndrpdr_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-coverage-2302" in path] +filtered_paths = [path for path in paths if "report-coverage-2306" in path] out_sdf = process_json_to_dataframe("ndrpdr", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/coverage_reconf_rls2302.py b/csit.infra.etl/coverage_reconf_rls2306.py similarity index 99% rename from csit.infra.etl/coverage_reconf_rls2302.py rename to csit.infra.etl/coverage_reconf_rls2306.py index 76e8c6f9ce..32885744d7 100644 --- a/csit.infra.etl/coverage_reconf_rls2302.py +++ b/csit.infra.etl/coverage_reconf_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-coverage-2302" in path] +filtered_paths = [path for path in paths if "report-coverage-2306" in path] out_sdf = process_json_to_dataframe("reconf", filtered_paths) out_sdf.show(truncate=False) @@ -155,7 +155,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/coverage_soak_rls2302.py b/csit.infra.etl/coverage_soak_rls2306.py similarity index 99% rename from csit.infra.etl/coverage_soak_rls2302.py rename to csit.infra.etl/coverage_soak_rls2306.py index 7cd171470d..fd4b9fed35 100644 --- a/csit.infra.etl/coverage_soak_rls2302.py +++ b/csit.infra.etl/coverage_soak_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-coverage-2302" in path] +filtered_paths = [path for path in paths if "report-coverage-2306" in path] out_sdf = process_json_to_dataframe("soak", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/coverage_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/iterative_hoststack_rls2302.py b/csit.infra.etl/iterative_hoststack_rls2306.py similarity index 99% rename from csit.infra.etl/iterative_hoststack_rls2302.py rename to csit.infra.etl/iterative_hoststack_rls2306.py index 6ecd723f34..0b179dea88 100644 --- a/csit.infra.etl/iterative_hoststack_rls2302.py +++ b/csit.infra.etl/iterative_hoststack_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-iterative-2302" in path] +filtered_paths = [path for path in paths if "report-iterative-2306" in path] out_sdf = process_json_to_dataframe("hoststack", filtered_paths) out_sdf.show(truncate=False) @@ -155,7 +155,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/iterative_mrr_rls2302.py b/csit.infra.etl/iterative_mrr_rls2306.py similarity index 99% rename from csit.infra.etl/iterative_mrr_rls2302.py rename to csit.infra.etl/iterative_mrr_rls2306.py index 6ee7971aee..33ffff7ce4 100644 --- a/csit.infra.etl/iterative_mrr_rls2302.py +++ b/csit.infra.etl/iterative_mrr_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-iterative-2302" in path] +filtered_paths = [path for path in paths if "report-iterative-2306" in path] out_sdf = process_json_to_dataframe("mrr", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/iterative_ndrpdr_rls2302.py b/csit.infra.etl/iterative_ndrpdr_rls2306.py similarity index 99% rename from csit.infra.etl/iterative_ndrpdr_rls2302.py rename to csit.infra.etl/iterative_ndrpdr_rls2306.py index 81e6f489c2..9b3a36be18 100644 --- a/csit.infra.etl/iterative_ndrpdr_rls2302.py +++ b/csit.infra.etl/iterative_ndrpdr_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-iterative-2302" in path] +filtered_paths = [path for path in paths if "report-iterative-2306" in path] out_sdf = process_json_to_dataframe("ndrpdr", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/iterative_reconf_rls2302.py b/csit.infra.etl/iterative_reconf_rls2306.py similarity index 99% rename from csit.infra.etl/iterative_reconf_rls2302.py rename to csit.infra.etl/iterative_reconf_rls2306.py index 47f27a22a1..a45ac66a83 100644 --- a/csit.infra.etl/iterative_reconf_rls2302.py +++ b/csit.infra.etl/iterative_reconf_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-iterative-2302" in path] +filtered_paths = [path for path in paths if "report-iterative-2306" in path] out_sdf = process_json_to_dataframe("reconf", filtered_paths) out_sdf.show(truncate=False) @@ -155,7 +155,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/csit.infra.etl/iterative_soak_rls2302.py b/csit.infra.etl/iterative_soak_rls2306.py similarity index 99% rename from csit.infra.etl/iterative_soak_rls2302.py rename to csit.infra.etl/iterative_soak_rls2306.py index ac24b6ba3a..ccc5012199 100644 --- a/csit.infra.etl/iterative_soak_rls2302.py +++ b/csit.infra.etl/iterative_soak_rls2306.py @@ -141,7 +141,7 @@ paths = wr.s3.list_objects( ignore_empty=True ) -filtered_paths = [path for path in paths if "report-iterative-2302" in path] +filtered_paths = [path for path in paths if "report-iterative-2306" in path] out_sdf = process_json_to_dataframe("soak", filtered_paths) out_sdf.printSchema() @@ -154,7 +154,7 @@ out_sdf = out_sdf \ try: wr.s3.to_parquet( df=out_sdf.toPandas(), - path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2302", + path=f"s3://{S3_DOCS_BUCKET}/csit/parquet/iterative_rls2306", dataset=True, partition_cols=["test_type", "year", "month", "day"], compression="snappy", diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2306.hcl.tftpl index afea17abad..c769659bc6 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_device_rls2302.py" + "coverage_device_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2306.hcl.tftpl index 653a2fef6b..3567f0258e 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_hoststack_rls2302.py" + "coverage_hoststack_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2306.hcl.tftpl index 46d56a44bb..edfd995980 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_mrr_rls2302.py" + "coverage_mrr_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2306.hcl.tftpl index 041caa1cee..298853b15e 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_reconf_rls2302.py" + "coverage_ndrpdr_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2306.hcl.tftpl index e7b13996f7..82630ba64d 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_ndrpdr_rls2302.py" + "coverage_reconf_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2306.hcl.tftpl index 9642cd7f3a..f32a7cf024 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_soak_rls2302.py" + "coverage_soak_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2306.hcl.tftpl index 074dc0b0ec..c4ebf032d8 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_hoststack_rls2302.py" + "iterative_hoststack_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2306.hcl.tftpl index d5694576aa..d4e0f9598f 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_mrr_rls2302.py" + "iterative_mrr_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2306.hcl.tftpl index eb7d35e930..e18ebbc6e2 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_ndrpdr_rls2302.py" + "iterative_ndrpdr_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2306.hcl.tftpl index be9c621c99..46b5ba2c80 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_reconf_rls2302.py" + "iterative_reconf_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2302.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2306.hcl.tftpl similarity index 97% rename from fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2302.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2306.hcl.tftpl index 182100ce76..7df5aef88f 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2302.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2306.hcl.tftpl @@ -33,7 +33,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_soak_rls2302.py" + "iterative_soak_rls2306.py" ] work_dir = "/local/csit/csit.infra.etl" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/main.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/main.tf index d66c13b1aa..ec1a38d375 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/main.tf +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/main.tf @@ -74,7 +74,7 @@ module "etl-trending-ndrpdr" { job_name = "etl-trending-ndrpdr" } -module "etl-iterative-hoststack-rls2302" { +module "etl-iterative-hoststack-rls2306" { providers = { nomad = nomad.yul1 } @@ -88,10 +88,10 @@ module "etl-iterative-hoststack-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-iterative-hoststack-rls2302" + job_name = "etl-iterative-hoststack-rls2306" } -module "etl-iterative-mrr-rls2302" { +module "etl-iterative-mrr-rls2306" { providers = { nomad = nomad.yul1 } @@ -105,10 +105,10 @@ module "etl-iterative-mrr-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-iterative-mrr-rls2302" + job_name = "etl-iterative-mrr-rls2306" } -module "etl-iterative-ndrpdr-rls2302" { +module "etl-iterative-ndrpdr-rls2306" { providers = { nomad = nomad.yul1 } @@ -122,10 +122,10 @@ module "etl-iterative-ndrpdr-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-iterative-ndrpdr-rls2302" + job_name = "etl-iterative-ndrpdr-rls2306" } -module "etl-iterative-reconf-rls2302" { +module "etl-iterative-reconf-rls2306" { providers = { nomad = nomad.yul1 } @@ -139,10 +139,10 @@ module "etl-iterative-reconf-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-iterative-reconf-rls2302" + job_name = "etl-iterative-reconf-rls2306" } -module "etl-iterative-soak-rls2302" { +module "etl-iterative-soak-rls2306" { providers = { nomad = nomad.yul1 } @@ -156,10 +156,10 @@ module "etl-iterative-soak-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-iterative-soak-rls2302" + job_name = "etl-iterative-soak-rls2306" } -module "etl-coverage-device-rls2302" { +module "etl-coverage-device-rls2306" { providers = { nomad = nomad.yul1 } @@ -173,10 +173,10 @@ module "etl-coverage-device-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-coverage-device-rls2302" + job_name = "etl-coverage-device-rls2306" } -module "etl-coverage-hoststack-rls2302" { +module "etl-coverage-hoststack-rls2306" { providers = { nomad = nomad.yul1 } @@ -190,10 +190,10 @@ module "etl-coverage-hoststack-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-coverage-hoststack-rls2302" + job_name = "etl-coverage-hoststack-rls2306" } -module "etl-coverage-mrr-rls2302" { +module "etl-coverage-mrr-rls2306" { providers = { nomad = nomad.yul1 } @@ -207,10 +207,10 @@ module "etl-coverage-mrr-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-coverage-mrr-rls2302" + job_name = "etl-coverage-mrr-rls2306" } -module "etl-coverage-ndrpdr-rls2302" { +module "etl-coverage-ndrpdr-rls2306" { providers = { nomad = nomad.yul1 } @@ -224,10 +224,10 @@ module "etl-coverage-ndrpdr-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-coverage-ndrpdr-rls2302" + job_name = "etl-coverage-ndrpdr-rls2306" } -module "etl-coverage-reconf-rls2302" { +module "etl-coverage-reconf-rls2306" { providers = { nomad = nomad.yul1 } @@ -241,10 +241,10 @@ module "etl-coverage-reconf-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-coverage-reconf-rls2302" + job_name = "etl-coverage-reconf-rls2306" } -module "etl-coverage-soak-rls2302" { +module "etl-coverage-soak-rls2306" { providers = { nomad = nomad.yul1 } @@ -258,5 +258,5 @@ module "etl-coverage-soak-rls2302" { out_aws_default_region = data.vault_generic_secret.fdio_docs.data["region"] cron = "@daily" datacenters = ["yul1"] - job_name = "etl-coverage-soak-rls2302" + job_name = "etl-coverage-soak-rls2306" } -- 2.16.6