Skip to content

Commit 0c9ec2e

Browse files
Apache9Apache9
committed
HBASE-26747 Addendum use python2 directly in Jenkinsfile and Jenkinsfile_Github
1 parent 85fadfd commit 0c9ec2e

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

‎dev-support/Jenkinsfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,14 @@ pipeline {
269269
if [ -d "${OUTPUT_DIR}/branch-site" ]; then
270270
echo "Remove ${OUTPUT_DIR}/branch-site for saving space"
271271
rm -rf "${OUTPUT_DIR}/branch-site"
272-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/branch-site" > "${OUTPUT_DIR}/branch-site.html"
272+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/branch-site" > "${OUTPUT_DIR}/branch-site.html"
273273
else
274274
echo "No branch-site, skipping"
275275
fi
276276
if [ -d "${OUTPUT_DIR}/patch-site" ]; then
277277
echo "Remove ${OUTPUT_DIR}/patch-site for saving space"
278278
rm -rf "${OUTPUT_DIR}/patch-site"
279-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/patch-site" > "${OUTPUT_DIR}/patch-site.html"
279+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/patch-site" > "${OUTPUT_DIR}/patch-site.html"
280280
else
281281
echo "No patch-site, skipping"
282282
fi
@@ -386,7 +386,7 @@ pipeline {
386386
if [ -f "${OUTPUT_DIR}/test_logs.zip" ]; then
387387
echo "Remove ${OUTPUT_DIR}/test_logs.zip for saving space"
388388
rm -rf "${OUTPUT_DIR}/test_logs.zip"
389-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
389+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
390390
else
391391
echo "No test_logs.zip, skipping"
392392
fi
@@ -496,7 +496,7 @@ pipeline {
496496
if [ -f "${OUTPUT_DIR}/test_logs.zip" ]; then
497497
echo "Remove ${OUTPUT_DIR}/test_logs.zip for saving space"
498498
rm -rf "${OUTPUT_DIR}/test_logs.zip"
499-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
499+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
500500
else
501501
echo "No test_logs.zip, skipping"
502502
fi
@@ -610,7 +610,7 @@ pipeline {
610610
if [ -f "${OUTPUT_DIR}/test_logs.zip" ]; then
611611
echo "Remove ${OUTPUT_DIR}/test_logs.zip for saving space"
612612
rm -rf "${OUTPUT_DIR}/test_logs.zip"
613-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
613+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
614614
else
615615
echo "No test_logs.zip, skipping"
616616
fi
@@ -726,7 +726,7 @@ pipeline {
726726
if [ -f "${OUTPUT_DIR}/test_logs.zip" ]; then
727727
echo "Remove ${OUTPUT_DIR}/test_logs.zip for saving space"
728728
rm -rf "${OUTPUT_DIR}/test_logs.zip"
729-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
729+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${OUTPUT_DIR_RELATIVE}" > "${OUTPUT_DIR}/test_logs.html"
730730
else
731731
echo "No test_logs.zip, skipping"
732732
fi
@@ -891,7 +891,7 @@ pipeline {
891891
if [ -f "${SRC_TAR}" ]; then
892892
echo "Remove ${SRC_TAR} for saving space"
893893
rm -rf "${SRC_TAR}"
894-
./${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/output-srctarball" > "${WORKSPACE}/output-srctarball/hbase-src.html"
894+
python2 ${BASEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/output-srctarball" > "${WORKSPACE}/output-srctarball/hbase-src.html"
895895
else
896896
echo "No hbase-src.tar.gz, skipping"
897897
fi

‎dev-support/Jenkinsfile_GitHub‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,14 @@ pipeline {
141141
if [ -d "${PATCHDIR}/branch-site" ]; then
142142
echo "Remove ${PATCHDIR}/branch-site for saving space"
143143
rm -rf "${PATCHDIR}/branch-site"
144-
./${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/branch-site" > "${PATCHDIR}/branch-site.html"
144+
python2 ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/branch-site" > "${PATCHDIR}/branch-site.html"
145145
else
146146
echo "No branch-site, skipping"
147147
fi
148148
if [ -d "${PATCHDIR}/patch-site" ]; then
149149
echo "Remove ${PATCHDIR}/patch-site for saving space"
150150
rm -rf "${PATCHDIR}/patch-site"
151-
./${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/patch-site" > "${PATCHDIR}/patch-site.html"
151+
python2 ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/patch-site" > "${PATCHDIR}/patch-site.html"
152152
else
153153
echo "No patch-site, skipping"
154154
fi
@@ -279,7 +279,7 @@ pipeline {
279279
if [ -f "${PATCHDIR}/test_logs.zip" ]; then
280280
echo "Remove ${PATCHDIR}/test_logs.zip for saving space"
281281
rm -rf "${PATCHDIR}/test_logs.zip"
282-
./${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
282+
python2 ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
283283
else
284284
echo "No test_logs.zip, skipping"
285285
fi
@@ -410,7 +410,7 @@ pipeline {
410410
if [ -f "${PATCHDIR}/test_logs.zip" ]; then
411411
echo "Remove ${PATCHDIR}/test_logs.zip for saving space"
412412
rm -rf "${PATCHDIR}/test_logs.zip"
413-
./${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
413+
python2 ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
414414
else
415415
echo "No test_logs.zip, skipping"
416416
fi

0 commit comments

Comments
 (0)