From 6ae9a18f4e563975a8d486423575060bf668a7a0 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 20:56:32 +0800 Subject: [PATCH 01/10] update Jenkinsfile --- ci/jenkins/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 5bed76c..ac62857 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -81,6 +81,7 @@ spec: steps { container('milvus-build-env') { script { + sh "git branch" sh("printenv") sh "./ci/jenkins/scripts/test.sh" } From ad103690121314751bed7b3f00ae1a5438c7cdf3 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:22:52 +0800 Subject: [PATCH 02/10] update test.sh --- ci/jenkins/scripts/test.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index 55f3366..73ed45e 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -2,4 +2,8 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' -git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' \ No newline at end of file +git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' + +if [[ ${BRANCH_NAME} =~ "PR-" && ! -n ${CHANGE_BRANCH} ]];then + echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" +fi From 92a30ccf16c2dfa55cb077fa6b65daddf9d8841d Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:24:29 +0800 Subject: [PATCH 03/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index 73ed45e..533a8e5 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -6,4 +6,6 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed ' if [[ ${BRANCH_NAME} =~ "PR-" && ! -n ${CHANGE_BRANCH} ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" +else + echo "BRANCH_NAME: ${BRANCH_NAME}" fi From 72e0d9b047acb8405d7c7196b782ce4f2d0c5c0d Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:27:55 +0800 Subject: [PATCH 04/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index 533a8e5..df08ff2 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -4,7 +4,7 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' -if [[ ${BRANCH_NAME} =~ "PR-" && ! -n ${CHANGE_BRANCH} ]];then +if [[ ${BRANCH_NAME} == "PR-*" && ! -n ${CHANGE_BRANCH} ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else echo "BRANCH_NAME: ${BRANCH_NAME}" From 0b0a11a457fecb22fabe19e35d4105421805a1b0 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:31:37 +0800 Subject: [PATCH 05/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index df08ff2..5c4d69a 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -4,7 +4,7 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' -if [[ ${BRANCH_NAME} == "PR-*" && ! -n ${CHANGE_BRANCH} ]];then +if [[ ${BRANCH_NAME} == "PR-*" && -n ${CHANGE_BRANCH} ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else echo "BRANCH_NAME: ${BRANCH_NAME}" From 478e533d2c475be0b3cb2624d1a1739ff4bade46 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:33:49 +0800 Subject: [PATCH 06/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index 5c4d69a..d4bef6b 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -7,5 +7,5 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed ' if [[ ${BRANCH_NAME} == "PR-*" && -n ${CHANGE_BRANCH} ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else - echo "BRANCH_NAME: ${BRANCH_NAME}" + echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" fi From 06bef7d56cf31966bdda58dc7602a68ac6530133 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:38:26 +0800 Subject: [PATCH 07/10] update test.sh --- ci/jenkins/scripts/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index d4bef6b..977ed2f 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -4,8 +4,8 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' -if [[ ${BRANCH_NAME} == "PR-*" && -n ${CHANGE_BRANCH} ]];then +if [[ -n ${CHANGE_BRANCH} && ${BRANCH_NAME} == "PR-*" ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else - echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" + echo "BRANCH_NAME: ${BRANCH_NAME}" fi From 214f0c4daa61b9358d70ac4aed4c72816a31c248 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:42:49 +0800 Subject: [PATCH 08/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index 977ed2f..6f6092b 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -4,7 +4,7 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' -if [[ -n ${CHANGE_BRANCH} && ${BRANCH_NAME} == "PR-*" ]];then +if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" == "PR-*" ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else echo "BRANCH_NAME: ${BRANCH_NAME}" From 2808eef7281c4de2baeb3f651eea8ccc6550de0b Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:44:41 +0800 Subject: [PATCH 09/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index 6f6092b..b247f47 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -4,7 +4,7 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' -if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" == "PR-*" ]];then +if [[ -n "${CHANGE_BRANCH}" ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else echo "BRANCH_NAME: ${BRANCH_NAME}" From b16297777b94199381d8009be27181404a887edc Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 26 Nov 2019 21:48:07 +0800 Subject: [PATCH 10/10] update test.sh --- ci/jenkins/scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/scripts/test.sh b/ci/jenkins/scripts/test.sh index b247f47..31187f1 100755 --- a/ci/jenkins/scripts/test.sh +++ b/ci/jenkins/scripts/test.sh @@ -4,7 +4,7 @@ git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g' -if [[ -n "${CHANGE_BRANCH}" ]];then +if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" =~ "PR-" ]];then echo "BRANCH_NAME: ${BRANCH_NAME} CHANGE_BRANCH: ${CHANGE_BRANCH}" else echo "BRANCH_NAME: ${BRANCH_NAME}"