From 52001683a6a9050af02e565de191d01018a7627c Mon Sep 17 00:00:00 2001 From: Tulsi Shah Date: Sat, 23 Dec 2023 10:57:02 +0000 Subject: [PATCH] setting branch_name as env variable --- .../scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh | 2 +- .../e2e_tests/{e2e-tests-amd64.cfg => e2e-tests-master.cfg} | 5 +++++ .../e2e_tests/{e2e-tests-arm64.cfg => e2e-tests-release.cfg} | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) rename perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/{e2e-tests-amd64.cfg => e2e-tests-master.cfg} (93%) rename perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/{e2e-tests-arm64.cfg => e2e-tests-release.cfg} (92%) diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh index b0a868e479..9cc8666992 100755 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh @@ -22,7 +22,7 @@ readonly RUN_E2E_TESTS_ON_INSTALLED_PACKAGE=true cd "${KOKORO_ARTIFACTS_DIR}/github/gcsfuse" echo "Building and installing gcsfuse..." # Get the latest commitId of yesterday in the log file. Build gcsfuse and run -commitId=$(git log --before='yesterday 23:59:59' --max-count=1 --pretty=%H) +commitId=$(git log $BRANCH_NAME --before='yesterday 23:59:59' --max-count=1 --pretty=%H) ./perfmetrics/scripts/build_and_install_gcsfuse.sh $commitId echo "Running e2e tests on installed package...." diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-amd64.cfg b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-master.cfg similarity index 93% rename from perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-amd64.cfg rename to perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-master.cfg index 58b1e13a55..b42db3616e 100644 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-amd64.cfg +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-master.cfg @@ -12,6 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +env_vars { + key: "BRANCH_NAME" + value: "master" +} + action { define_artifacts { regex: "gcsfuse-failed-integration-test-logs-*" diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-arm64.cfg b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-release.cfg similarity index 92% rename from perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-arm64.cfg rename to perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-release.cfg index 58b1e13a55..339b266009 100644 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-arm64.cfg +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/e2e-tests-release.cfg @@ -12,6 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +env_vars { + key: "BRANCH_NAME" + value: "read_cache_release" +} + action { define_artifacts { regex: "gcsfuse-failed-integration-test-logs-*"