diff --git a/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/configs_alias.json b/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/configs_alias.json index a390eff0..b4d0c039 100644 --- a/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/configs_alias.json +++ b/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/configs_alias.json @@ -1,6 +1,6 @@ { "actions" : [ - { "remove" : { "index" : "jenkins_configs_1", "alias" : "jenkins_configs_alias" } }, - { "add" : { "index" : "jenkins_configs_1", "alias" : "jenkins_configs_alias" } } + { "remove" : { "index" : "jenkins_configs_1", "alias" : "jenkins_configs" } }, + { "add" : { "index" : "jenkins_configs_1", "alias" : "jenkins_configs" } } ] } diff --git a/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/file_alias.json b/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/file_alias.json index 432a9568..33a89785 100644 --- a/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/file_alias.json +++ b/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/file_alias.json @@ -1,6 +1,6 @@ { "actions" : [ - { "remove" : { "index" : "jenkins_file_1", "alias" : "jenkins_file_alias" } }, - { "add" : { "index" : "jenkins_file_1", "alias" : "jenkins_file_alias" } } + { "remove" : { "index" : "jenkins_file_1", "alias" : "jenkins_file" } }, + { "add" : { "index" : "jenkins_file_1", "alias" : "jenkins_file" } } ] } diff --git a/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/subject_alias.json b/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/subject_alias.json index 18b985dd..a02f71cb 100644 --- a/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/subject_alias.json +++ b/gen3-integration-tests/test_data/test_setup/guppy_es_indexes/es_indexes_data/subject_alias.json @@ -1,6 +1,6 @@ { "actions" : [ - { "remove" : { "index" : "jenkins_subject_1", "alias" : "jenkins_subject_alias" } }, - { "add" : { "index" : "jenkins_subject_1", "alias" : "jenkins_subject_alias" } } + { "remove" : { "index" : "jenkins_subject_1", "alias" : "jenkins_subject" } }, + { "add" : { "index" : "jenkins_subject_1", "alias" : "jenkins_subject" } } ] } diff --git a/gen3-integration-tests/utils/gen3_admin_tasks.py b/gen3-integration-tests/utils/gen3_admin_tasks.py index fcd8e20f..82401d50 100644 --- a/gen3-integration-tests/utils/gen3_admin_tasks.py +++ b/gen3-integration-tests/utils/gen3_admin_tasks.py @@ -170,6 +170,8 @@ def run_gen3_job( # Local Helm Deployments elif os.getenv("GEN3_INSTANCE_TYPE") == "HELM_LOCAL": # job_pod = f"{job_name}-{uuid.uuid4()}" + if job_name == "etl": + job_name = "etl-cronjob" cmd = ["kubectl", "delete", "job", job_name] result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) if not result.returncode == 0: @@ -731,7 +733,63 @@ def check_indices_after_etl(test_env_namespace: str): raise Exception("Build number not found") # Local Helm Deployments elif os.getenv("GEN3_INSTANCE_TYPE") == "HELM_LOCAL": - pass + get_alias_cmd = "kubectl get cm etl-mapping -o jsonpath='{.data.etlMapping\\.yaml}' | yq '.mappings[].name' | xargs" + get_alias_result = subprocess.run( + get_alias_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + shell=True, + text=True, + ) + if not get_alias_result.returncode == 0: + raise Exception( + f"Unable to get alias. Error: {get_alias_result.stderr.strip()}" + ) + for alias_name in get_alias_result.stdout.strip().split(" "): + get_alias_status_cmd = [ + "curl", + "-I", + "-s", + f"localhost:9200/_alias/{alias_name}", + ] + get_alias_status_result = subprocess.run( + get_alias_status_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True, + ) + + if not get_alias_status_result.returncode == 0: + raise Exception( + f"Unable to get status code for {alias_name}. Error: {get_alias_status_result.stderr.strip()}" + ) + assert ( + "200 OK" in get_alias_status_result.stdout.strip() + ), f"Expected 200 OK but got {get_alias_status_result.stdout.strip()} for {alias_name}" + logger.info(f"{alias_name} is present") + + get_indices_name_cmd = [ + "curl", + "-X", + "GET", + "-s", + f"localhost:9200/_alias/{alias_name}", + ] + get_indices_name_result = subprocess.run( + get_indices_name_cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True, + ) + if not get_indices_name_result.returncode == 0: + raise Exception( + f"Unable to get status code for {alias_name}. Error: {get_indices_name_result.stderr.strip()}" + ) + data = json.loads(get_indices_name_result.stdout.strip()) + indices_name = list(data.keys())[0] + version = indices_name.split("_")[-1] + if version == "1": + logger.info(f"Index version has increased for {alias_name}") def create_access_token(service, expired, username, test_env_namespace: str = ""):