From d3f1b791ebbe07257c562aeba18fa6bb27dbf5ee Mon Sep 17 00:00:00 2001
From: Youjung Kim <126618609+ykim-1@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:24:43 -0700
Subject: [PATCH] update e2e test submodule (#254)

---
 .github/workflows/integration-unit-test.yml | 19 +++++++++----------
 .gitmodules                                 |  7 ++++---
 e2e_scripts                                 |  1 +
 tod_scripts                                 |  1 -
 4 files changed, 14 insertions(+), 14 deletions(-)
 create mode 160000 e2e_scripts
 delete mode 160000 tod_scripts

diff --git a/.github/workflows/integration-unit-test.yml b/.github/workflows/integration-unit-test.yml
index e359988c..16bedfb9 100644
--- a/.github/workflows/integration-unit-test.yml
+++ b/.github/workflows/integration-unit-test.yml
@@ -73,19 +73,18 @@ jobs:
       - name: Set release version env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - name: Add additional information to XML report
+
+      - name: Add variables and upload test results
+        if: always()
         run: |
-          filename=$(ls | grep -E '^[0-9]{12}_packer_test_report\.xml$') 
-          python tod_scripts/add_to_xml_test_report.py \
-          --branch_name "${{ env.RELEASE_VERSION }}" \
+          filename=$(ls | grep -E '^[0-9]{12}_packer_test_report\.xml$')
+          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}"
-
-      - name: Upload test results to the bucket
-        run: |
-          filename=$(ls | grep -E '^[0-9]{12}_packer_test_report\.xml$')
-          python3 tod_scripts/test_report_upload_script.py "${filename}"
+          sync
+          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 }}
+          LINODE_CLI_OBJ_SECRET_KEY: ${{ secrets.LINODE_CLI_OBJ_SECRET_KEY }}
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index df7dc11d..0d1db602 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
-[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