ci: use same flaky test process script on macOS (#13485)

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
envoyproxy · Oct 10, 2020 · 7af2b2b · 7af2b2b
1 parent 3e5a961
commit 7af2b2b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
@@ -201,7 +201,7 @@ jobs:
           testRunTitle: "macOS"
         condition: always()
 
-      - script: ./ci/flaky_test/run_process_xml_mac.sh
+      - script: ./ci/flaky_test/run_process_xml.sh
         displayName: "Process Test Results"
         env:
           TEST_TMPDIR: $(Build.SourcesDirectory)

diff --git a/ci/flaky_test/run_process_xml.sh b/ci/flaky_test/run_process_xml.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export ENVOY_SRCDIR=${ENVOY_SRCDIR:-.}
+
 # shellcheck source=tools/shell_utils.sh
 . "${ENVOY_SRCDIR}"/tools/shell_utils.sh
 

diff --git a/ci/flaky_test/run_process_xml_mac.sh b/ci/flaky_test/run_process_xml_mac.sh
diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh
@@ -65,4 +65,4 @@ fi
 
 bazel version
 
-pip3 install slackclient
+pip3 install virtualenv
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,4 +65,4 @@ fi

		bazel version

		pip3 install slackclient
		pip3 install virtualenv