Skip to content

Commit 60f6186

Browse files
SNOW-2160718 adjust ec2 IP in WIF tests, limit docker resources (#2503)
1 parent a019ab2 commit 60f6186

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

ci/test_wif.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ run_tests_and_set_result() {
1818
set -o pipefail
1919
docker run \
2020
--rm \
21+
--cpus=1 \
22+
-m 1g \
2123
-e BRANCH \
2224
-e SNOWFLAKE_TEST_WIF_PROVIDER \
2325
-e SNOWFLAKE_TEST_WIF_HOST \
@@ -48,11 +50,14 @@ EOF
4850

4951
get_branch() {
5052
local branch
51-
branch=$(git rev-parse --abbrev-ref HEAD)
52-
if [[ "$branch" == "HEAD" ]]; then
53-
branch=$(git name-rev --name-only HEAD | sed 's#^remotes/origin/##;s#^origin/##')
53+
if [[ -n "${GIT_BRANCH}" ]]; then
54+
# Jenkins
55+
branch="${GIT_BRANCH}"
56+
else
57+
# Local
58+
branch=$(git rev-parse --abbrev-ref HEAD)
5459
fi
55-
echo "$branch"
60+
echo "${branch}"
5661
}
5762

5863
setup_parameters() {
2 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)