remove MaxCompute_service

shanye997 · Dec 22, 2023 · e9d480c · e9d480c
1 parent eaceef7
commit e9d480c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -24,5 +24,5 @@ jobs:
       - name: e2e test
         run: |
           objectPath="github-action/${{github.repository}}/e2e/Action-${{github.run_number}}/Attempt-${{github.run_attempt}}"
-          curl -s https://exampleodule-ci-terrafoodule-ci-adpgxuiilx.ap-southeast-1.fcapp.run/?branch=${{github.event.pull_request.head.ref}}\&repo_name=${{github.event.pull_request.head.repo.full_name}}\&oss_object_path=${objectPath}
-          go run scripts/e2e_check.go ${objectPath}
+          curl -s https://exampleodule-ci-terrafoodule-ci-adpgxuiilx.ap-southeast-1.fcapp.run/?branch=${{github.event.pull_request.head.ref}}\&repo_name=${{github.event.pull_request.head.repo.full_name}}\&oss_object_path=${objectPath}\&job_id=${{github.run_id}}-${{github.run_attempt}}
+          go run scripts/e2e_check.go ${objectPath} ${{github.run_id}}-${{github.run_attempt}}
diff --git a/.github/workflows/weekly_e2e.yml b/.github/workflows/weekly_e2e.yml
@@ -14,8 +14,8 @@ jobs:
       - name: weekly e2e test
         run: |
           objectPath="github-action/${{github.repository}}/weekly-e2e/Action-${{github.run_number}}/Attempt-${{github.run_attempt}}"
-          curl -s https://exampleodule-ci-terrafoodule-ci-adpgxuiilx.ap-southeast-1.fcapp.run/?branch=main\&repo_name=${{github.repository}}\&oss_object_path=${objectPath}
-          go run scripts/e2e_check.go ${objectPath}
+          curl -s https://exampleodule-ci-terrafoodule-ci-adpgxuiilx.ap-southeast-1.fcapp.run/?branch=main\&repo_name=${{github.repository}}\&oss_object_path=${objectPath}\&job_id=${{github.run_id}}-${{github.run_attempt}}å
+          go run scripts/e2e_check.go ${objectPath} ${{github.run_id}}-${{github.run_attempt}}
       - name: update test record
         run: |
           git add TestRecord.md

diff --git a/scripts/e2e_check.go b/scripts/e2e_check.go
@@ -14,9 +14,10 @@ var urlPrefix = "https://terraform-fc-test-for-example-module.oss-ap-southeast-1
 
 func main() {
 	ossObjectPath := strings.TrimSpace(os.Args[1])
+	jobId := strings.TrimSpace(os.Args[2])
 	log.Println("run log path:", ossObjectPath)
-	runLogFileName := "terraform.run.log"
-	runResultFileName := "terraform.run.result.log"
+	runLogFileName := jobId + "-terraform.run.log"
+	runResultFileName := jobId + "-terraform.run.result.log"
 	runLogUrl := urlPrefix + "/" + ossObjectPath + "/" + runLogFileName
 	runResultUrl := urlPrefix + "/" + ossObjectPath + "/" + runResultFileName
 	lastLineNum := 0