diff --git a/.github/workflows/e2e-suite.yml b/.github/workflows/e2e-suite.yml index cdcfe41d..6f4074d1 100644 --- a/.github/workflows/e2e-suite.yml +++ b/.github/workflows/e2e-suite.yml @@ -82,13 +82,13 @@ jobs: if: always() run: | filename=$(ls | grep -E '^[0-9]{12}_cli_test_report\.xml$') - python tod_scripts/add_to_xml_test_report.py \ + python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/add_gha_info_to_xml.py \ --branch_name "${GITHUB_REF#refs/*/}" \ --gha_run_id "$GITHUB_RUN_ID" \ --gha_run_number "$GITHUB_RUN_NUMBER" \ --xmlfile "${filename}" sync - python tod_scripts/test_report_upload_script.py "${filename}" + python3 e2e_scripts/tod_scripts/xml_to_obj_storage/scripts/xml_to_obj.py "${filename}" env: LINODE_CLI_OBJ_ACCESS_KEY: ${{ secrets.LINODE_CLI_OBJ_ACCESS_KEY }} LINODE_CLI_OBJ_SECRET_KEY: ${{ secrets.LINODE_CLI_OBJ_SECRET_KEY }} \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 9002a58f..e1e863fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,6 @@ [submodule "test/test_helper/bats-support"] path = test/test_helper/bats-support url = https://github.com/ztombol/bats-support -[submodule "tod_scripts"] - path = tod_scripts - url = https://github.com/linode/TOD-test-report-uploader.git +[submodule "e2e_scripts"] + path = e2e_scripts + url = https://github.com/linode/dx-e2e-test-scripts diff --git a/e2e_scripts b/e2e_scripts new file mode 160000 index 00000000..b5617852 --- /dev/null +++ b/e2e_scripts @@ -0,0 +1 @@ +Subproject commit b56178520fae446a0a4f38df6259deb845efa667 diff --git a/tod_scripts b/tod_scripts deleted file mode 160000 index f6da35dc..00000000 --- a/tod_scripts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f6da35dcb089fced7bcaf2a3c6ad29929f0d126c