Merge branch '2.1.x' into 2.2.x

Closes gh-20801

ci/parameters.yml

@@ -1,4 +1,3 @@
-docker-upgrade-issue-title: "Upgrade Docker version in CI"
 email-server: "smtp.svc.pivotal.io"
 email-from: "ci@spring.io"
 email-to: ["spring-boot-dev@pivotal.io"]

ci/pipeline.yml

@@ -230,7 +230,6 @@ jobs:
       params:
         GITHUB_REPO: spring-boot
         GITHUB_ORGANIZATION: spring-projects
-        ISSUE_TITLE: ((docker-upgrade-issue-title))
       image: spring-boot-ci-image
     - put: git-repo-ci-docker
       params:
@@ -245,7 +244,6 @@ jobs:
         GITHUB_ORGANIZATION: spring-projects
         GITHUB_PASSWORD: ((github-password))
         GITHUB_USERNAME: ((github-username))
-        ISSUE_TITLE: ((docker-upgrade-issue-title))
       image: spring-boot-ci-image
 - name: build
   serial: true

ci/scripts/create-pull-request.sh

@@ -2,6 +2,7 @@
 set -e
 
 if [[ -f commit-details/message ]]; then
+	ISSUE_TITLE="$(cat commit-details/message)"
 	curl \
 	  -s \
 		-u ${GITHUB_USERNAME}:${GITHUB_PASSWORD} \

ci/scripts/detect-docker-updates.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-existing_tasks=$( curl -s https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/pulls\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster )
-existing_upgrade_issues=$( echo "$existing_tasks" | jq -c --arg TITLE "$ISSUE_TITLE" '.[] | select(.title==$TITLE)' )
+latest_version=$(curl -I -s https://github.com/docker/docker-ce/releases/latest | grep "location:" | awk '{n=split($0, parts, "/"); print substr(parts[n],2);}' | awk '{$1=$1;print}' | tr -d '\r' | tr -d '\n' )
+title_prefix="Upgrade CI to Docker"
+
+existing_upgrade_issues=$( curl -s https://api.github.com/repos/spring-projects/spring-boot/issues\?labels\=type:%20task\&state\=open\&creator\=spring-buildmaster | jq -c --arg TITLE_PREFIX "$title_prefix" '.[] | select(.pull_request != null) | select(.title | startswith($TITLE_PREFIX))' )
 
 if [[ ${existing_upgrade_issues} = "" ]]; then
   git clone git-repo git-repo-updated > /dev/null
@@ -11,8 +13,6 @@ else
   exit 0
 fi
 
-latest_version=$(curl -I -s https://github.com/docker/docker-ce/releases/latest | grep "location:" | awk '{n=split($0, parts, "/"); print substr(parts[n],2);}' | awk '{$1=$1;print}' | tr -d '\r' | tr -d '\n' )
-
 if [[ $latest_version =~ (beta|rc) ]]; then
 	echo "Skip pre-release versions"
 	exit 0;
@@ -31,7 +31,7 @@ git config user.name "Spring Buildmaster" > /dev/null
 git config user.email "buildmaster@springframework.org" > /dev/null
 sed -i "s/version=.*/version=\"$latest_version\"/" ci/images/get-docker-url.sh
 git add ci/images/get-docker-url.sh > /dev/null
-commit_message="Upgrade to Docker $latest_version in CI"
+commit_message="$title_prefix $latest_version"
 git commit -m "$commit_message" > /dev/null
 popd
 echo ${commit_message} > commit-details/message

ci/tasks/create-pull-request.yml

@@ -10,6 +10,5 @@ params:
   GITHUB_ORGANIZATION:
   GITHUB_PASSWORD:
   GITHUB_USERNAME:
-  ISSUE_TITLE:
 run:
   path: git-repo/ci/scripts/create-pull-request.sh

ci/tasks/detect-docker-updates.yml

@@ -9,6 +9,5 @@ outputs:
 params:
   GITHUB_REPO:
   GITHUB_ORGANIZATION:
-  ISSUE_TITLE:
 run:
   path: git-repo/ci/scripts/detect-docker-updates.sh