From b1684be1d47ba4aabd4621070502905f9228781f Mon Sep 17 00:00:00 2001 From: Chong Gao Date: Tue, 2 Jan 2024 17:02:33 +0800 Subject: [PATCH 1/2] Fix CI: can't find script when there is pushd in script Signed-off-by: Chong Gao --- jenkins/spark-tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/spark-tests.sh b/jenkins/spark-tests.sh index 5afd411b2f1..869ab8d4b9f 100755 --- a/jenkins/spark-tests.sh +++ b/jenkins/spark-tests.sh @@ -20,6 +20,8 @@ set -ex nvidia-smi . jenkins/version-def.sh +# if run in jenkins WORKSPACE refers to rapids root path; if not run in jenkins just use current pwd(contains jenkins dirs) +WORKSPACE=${WORKSPACE:-`pwd`} ARTF_ROOT="$WORKSPACE/jars" MVN_GET_CMD="mvn -Dmaven.wagon.http.retryHandler.count=3 org.apache.maven.plugins:maven-dependency-plugin:2.8:get -B \ @@ -273,7 +275,7 @@ run_pyarrow_tests() { run_non_utc_time_zone_tests() { # select one time zone according to current day of week - source "$(dirname "$0")"/test-timezones.sh + source "${WORKSPACE}/jenkins/test-timezones.sh" time_zones_length=${#time_zones_test_cases[@]} # get day of week, Sunday is represented by 0 and Saturday by 6 current_date=$(date +%w) From de6af86c302c2c892a0a66169866567c0149f5c1 Mon Sep 17 00:00:00 2001 From: Chong Gao Date: Wed, 3 Jan 2024 10:10:36 +0800 Subject: [PATCH 2/2] Update Copy rights --- jenkins/spark-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/spark-tests.sh b/jenkins/spark-tests.sh index 869ab8d4b9f..377e77e3b53 100755 --- a/jenkins/spark-tests.sh +++ b/jenkins/spark-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.