[pulsar] branch branch-2.11 updated: [fix][CI] Fix issue in cherry-picking CI changes

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new 92215756943 [fix][CI] Fix issue in cherry-picking CI changes
92215756943 is described below

commit 92215756943794fd3c5823b2aa8a90ff01379fcb
Author: Lari Hotari <lhot...@apache.org>
AuthorDate: Wed Sep 21 15:09:06 2022 +0300

    [fix][CI] Fix issue in cherry-picking CI changes
    
    - #17148 changes aren't in branch-2.11
    - sync pulsar_ci_tool.sh with #17770
---
 .github/workflows/pulsar-ci.yaml | 4 ++--
 build/pulsar_ci_tool.sh          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml
index 0436d9f4c3d..e7cf347c06c 100644
--- a/.github/workflows/pulsar-ci.yaml
+++ b/.github/workflows/pulsar-ci.yaml
@@ -300,7 +300,7 @@ jobs:
         run: |
           # build docker image
           mvn -B -am -pl tests/docker-images/java-test-image install 
-Pcore-modules,-main,integrationTests,docker \
-          -Dmaven.test.skip=true -Ddocker.squash=true 
-DskipSourceReleaseAssembly=true \
+          -Dmaven.test.skip=true -Ddockerfile.build.squash=true 
-DskipSourceReleaseAssembly=true \
           -Dspotbugs.skip=true  -Dlicense.skip=true -Dcheckstyle.skip=true 
-Drat.skip=true
 
       - name: save docker image apachepulsar/java-test-image:latest to Github 
artifact cache
@@ -620,7 +620,7 @@ jobs:
           # build docker image
           # include building of Pulsar SQL, Connectors, Offloaders and server 
distros
           mvn -B -am -pl 
pulsar-sql/presto-distribution,distribution/io,distribution/offloaders,distribution/server,tests/docker-images/latest-version-image
 install \
-          -Pmain,docker -Dmaven.test.skip=true -Ddocker.squash=true \
+          -Pmain,docker -Dmaven.test.skip=true -Ddockerfile.build.squash=true \
           -Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true 
-Drat.skip=true
 
       - name: Clean up disk space
diff --git a/build/pulsar_ci_tool.sh b/build/pulsar_ci_tool.sh
index 5c5a294c17d..431c7630e9b 100755
--- a/build/pulsar_ci_tool.sh
+++ b/build/pulsar_ci_tool.sh
@@ -202,7 +202,7 @@ function ci_check_ready_to_test() {
    If ${FORK_REPO_URL}/tree/${PR_BASE_BRANCH} is missing, you must sync the 
branch ${PR_BASE_BRANCH} on the command line.
    \`\`\`
    git fetch https://github.com/apache/pulsar ${PR_BASE_BRANCH}
-   git push ${FORK_REPO_URL} FETCH_HEAD:${PR_BASE_BRANCH}
+   git push ${FORK_REPO_URL} FETCH_HEAD:refs/heads/${PR_BASE_BRANCH}
    \`\`\`
 EOF
 )