From gli at openjdk.java.net  Wed Jun  1 08:21:30 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 08:21:30 GMT
Subject: RFR: 1434: Testissue#addLink doesn't generate the right
 relationship for the reversed link
In-Reply-To: <u9UjyDTPA_oIYJrHOcnEzIIjIbn4xLIWqbWtsvAsg2k=.eccf8c38-d4b2-49f0-8799-277d7233212d@github.com>
References: <cP-zyB4ZDgJ968VekOQO_7UJEvY_OGoenXz7JtSCu6M=.a5323077-9445-436b-a50b-82468f25837a@github.com>
 <u9UjyDTPA_oIYJrHOcnEzIIjIbn4xLIWqbWtsvAsg2k=.eccf8c38-d4b2-49f0-8799-277d7233212d@github.com>
Message-ID: <IGcGKXWOjNMLlkDCUjmFmIKObylFH-Mr7DUmX7k4pP8=.2124df6e-0ba5-45f7-b0a3-a0459fbcacf1@github.com>

On Tue, 31 May 2022 17:23:07 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Hi all,
>> 
>> This patch fixes the reversed link type. For example, when adding a `csr for` link at `ISSUE-1` which links to `ISSUE-2`, the `ISSUE-2` should have a reversed link `csr of` instead of the same link type `csr for`.
>> 
>> The reversed relations are shown below:
>> - `backported by` and `backport of`
>> - `csr for` and `csr of`
>> - `blocks` and `is blocked by`
>> - `clones` and `is cloned by`
>> 
>> And the `duplicates` link type doesn't have the reversed linke type like `duplicated by` now. So we should use the link type `duplicates` instead of `duplicated by` in the test cases so that the tests can be closer to the actual situation.
>> 
>> Thanks for taking the time to review.
>> 
>> Best Regards,
>> -- Guoxiong
>
> Marked as reviewed by erikj (Lead).

@erikj79 Thanks for the review.

-------------

PR: https://git.openjdk.java.net/skara/pull/1325

From gli at openjdk.java.net  Wed Jun  1 08:21:31 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 08:21:31 GMT
Subject: Integrated: 1434: Testissue#addLink doesn't generate the right
 relationship for the reversed link
In-Reply-To: <cP-zyB4ZDgJ968VekOQO_7UJEvY_OGoenXz7JtSCu6M=.a5323077-9445-436b-a50b-82468f25837a@github.com>
References: <cP-zyB4ZDgJ968VekOQO_7UJEvY_OGoenXz7JtSCu6M=.a5323077-9445-436b-a50b-82468f25837a@github.com>
Message-ID: <npMf2gtY_ma-UmTgCX26iLaptsp_QsiNhatzoOE53bg=.fa3af56f-0b6c-4211-b0d5-f1027e5e501d@github.com>

On Sat, 28 May 2022 08:33:36 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> This patch fixes the reversed link type. For example, when adding a `csr for` link at `ISSUE-1` which links to `ISSUE-2`, the `ISSUE-2` should have a reversed link `csr of` instead of the same link type `csr for`.
> 
> The reversed relations are shown below:
> - `backported by` and `backport of`
> - `csr for` and `csr of`
> - `blocks` and `is blocked by`
> - `clones` and `is cloned by`
> 
> And the `duplicates` link type doesn't have the reversed linke type like `duplicated by` now. So we should use the link type `duplicates` instead of `duplicated by` in the test cases so that the tests can be closer to the actual situation.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

This pull request has now been integrated.

Changeset: 925bd2b8
Author:    Guoxiong Li <gli at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/925bd2b8de1ea4a86d6b1e1815f7fd194ee13624
Stats:     13 lines in 3 files changed: 5 ins; 0 del; 8 mod

1434: Testissue#addLink doesn't generate the right relationship for the reversed link

Reviewed-by: erikj

-------------

PR: https://git.openjdk.java.net/skara/pull/1325

From gli at openjdk.java.net  Wed Jun  1 08:30:21 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 08:30:21 GMT
Subject: RFR: SKARA-1119: A bot should remind a PR author not to force push
 [v2]
In-Reply-To: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
References: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
Message-ID: <kVzW-XxkYJhFp-Ojs1TZt0FjDkkF5peEEoGCols7CVI=.93b244d6-a499-4d1d-9d48-3aaca72559ce@github.com>

> Hi all,
> 
> This patch adds a suggestion comment to the PR when the developers force-push the branch each time. Because I can't find the related rest api of the GitLab so I only implement it for GitHub.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:

  Fix suggestion comment.

-------------

Changes:
  - all: https://git.openjdk.java.net/skara/pull/1328/files
  - new: https://git.openjdk.java.net/skara/pull/1328/files/d4717ebf..c68c9680

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1328&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1328&range=00-01

  Stats: 3 lines in 1 file changed: 0 ins; 0 del; 3 mod
  Patch: https://git.openjdk.java.net/skara/pull/1328.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1328/head:pull/1328

PR: https://git.openjdk.java.net/skara/pull/1328

From gli at openjdk.java.net  Wed Jun  1 08:30:22 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 08:30:22 GMT
Subject: RFR: SKARA-1119: A bot should remind a PR author not to force push
 [v2]
In-Reply-To: <ZhDvO9LgBSAL_bA_Qr0rvvmJ-rL0KoCT3VfZVCZwY8k=.dc348a5e-13bb-4cd2-a80f-46b1756c518d@github.com>
References: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
 <ZhDvO9LgBSAL_bA_Qr0rvvmJ-rL0KoCT3VfZVCZwY8k=.dc348a5e-13bb-4cd2-a80f-46b1756c518d@github.com>
Message-ID: <2eMuV0oaGCyjSRQbMU9a9xEVHYW_mm4mKO0fOuyvm7A=.cd3b4797-d901-4249-9e02-94df67409b05@github.com>

On Tue, 31 May 2022 18:16:13 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Fix suggestion comment.
>
> bots/notify/src/main/java/org/openjdk/skara/bots/notify/prbranch/PullRequestBranchNotifier.java line 39:
> 
>> 37:             Please don't rebase and force-push to your branch of this PR because it invalidates previous review comments. \
>> 38:             To keep track of your changes incrementally, you only need to merge the target branch (optionally), \
>> 39:             commit your new change and push normally. The bot can squash them as a single commit when integrating.
> 
> Suggestion:
> 
>             Please do not rebase or force-push to an active PR as it invalidates existing review comments. \
>             All changes will be squashed into a single commit automatically when integrating. \
>             See [OpenJDK Developers? Guide](https://openjdk.java.net/guide/#working-with-pull-requests).

Fixed

-------------

PR: https://git.openjdk.java.net/skara/pull/1328

From gli at openjdk.java.net  Wed Jun  1 08:34:37 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 08:34:37 GMT
Subject: RFR: 1410: The reply message of the 'reviewers' command should be
 more accurate [v2]
In-Reply-To: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
References: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
Message-ID: <dTw95asAmjHND0V1Wyh214mtTdl3TDTrL8kYfl53reg=.adc4b70b-7b7e-4833-8213-0dcc343feb9d@github.com>

> Hi all,
> 
> This trivial patch fixes the reply message of the `reviewers` command.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:

  Fix comment.

-------------

Changes:
  - all: https://git.openjdk.java.net/skara/pull/1326/files
  - new: https://git.openjdk.java.net/skara/pull/1326/files/0c2a7024..9aa54824

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1326&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1326&range=00-01

  Stats: 4 lines in 2 files changed: 0 ins; 0 del; 4 mod
  Patch: https://git.openjdk.java.net/skara/pull/1326.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1326/head:pull/1326

PR: https://git.openjdk.java.net/skara/pull/1326

From gli at openjdk.java.net  Wed Jun  1 08:34:39 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 08:34:39 GMT
Subject: RFR: 1410: The reply message of the 'reviewers' command should be
 more accurate [v2]
In-Reply-To: <il5Cooc_7dVDAB2pn4dRYxa8cUD-pxM1EXZyE-zPMMI=.b3be365f-5ade-40c7-a775-8ac8f010756a@github.com>
References: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
 <il5Cooc_7dVDAB2pn4dRYxa8cUD-pxM1EXZyE-zPMMI=.b3be365f-5ade-40c7-a775-8ac8f010756a@github.com>
Message-ID: <AxQpTMC01L09jIgNWNyM5Xft_Yjj2eJK-IbHFfGaEFw=.dca2c342-44aa-4907-95bf-ee56590eea6e@github.com>

On Tue, 31 May 2022 17:28:43 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Fix comment.
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersCommand.java line 123:
> 
>> 121:             if (previous.isPresent()) {
>> 122:                 if (roleIsLower(role, previous.get().role())) {
>> 123:                     reply.println("Only the [Reviewers](https://openjdk.java.net/bylaws#reviewer) are allowed to lower the role for additional reviewers.");
> 
> Suggestion:
> 
>                     reply.println("Only [Reviewers](https://openjdk.java.net/bylaws#reviewer) are allowed to lower the role for additional reviewers.");

Fixed

> bots/pr/src/main/java/org/openjdk/skara/bots/pr/ReviewersCommand.java line 127:
> 
>> 125:                 }
>> 126:                 if (numReviewers < previous.get().number()) {
>> 127:                     reply.println("Only the [Reviewers](https://openjdk.java.net/bylaws#reviewer) are allowed to decrease the number of required reviewers.");
> 
> Suggestion:
> 
>                     reply.println("Only [Reviewers](https://openjdk.java.net/bylaws#reviewer) are allowed to decrease the number of required reviewers.");

Fixed

-------------

PR: https://git.openjdk.java.net/skara/pull/1326

From gli at openjdk.java.net  Wed Jun  1 09:35:39 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 09:35:39 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
Message-ID: <C8DS_G_GHYVFoR7EJfoSBRYHDqii6JfS6ehW6uVb2Mg=.65ecaae7-4e43-46d4-a2c0-71e7b43efdec@github.com>

On Tue, 31 May 2022 17:44:48 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Only check the Skara generated part. Adjust log. Avoid adding marker multiple times.
>
> bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java line 90:
> 
>> 88:                 pr.body().contains(csr.webUrl().toString()) &&
>> 89:                 pr.body().contains(csr.title() + " (**CSR**)");
>> 90:     }
> 
> We could consider making these checks safer by only looking in the Skara generated part of the body. There is a delimiter line you could split on.

Fixed.

> bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java line 121:
> 
>> 119:             var csr = csrOptional.get();
>> 120: 
>> 121:             log.info("Found CSR for " + describe(pr) + ". It has id " + csr.id());
> 
> I reacted to this log message the other day. Could you shorten it like this while in the area?
> 
> Suggestion:
> 
>             log.info("Found CSR " + csr.id() + " for " + describe(pr) + ");

Fixed.

> bots/csr/src/main/java/org/openjdk/skara/bots/csr/CSRBot.java line 184:
> 
>> 182:                 // this bot need to add the csr update marker so that the PR bot can update the message of the PR body.
>> 183:                 log.info("CSR closed and approved for " + describe(pr) + ", adding the csr update marker");
>> 184:                 pr.setBody(pr.body() + CSR_UPDATE_MARKER);
> 
> We need to make sure we only add the update marker once. Otherwise we would end up adding a very large amount of these if the PR bot happens to be stuck for a while. I would recommend a method for adding the marker, which first checks if the body contains the marker already.

Fixed.

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From gli at openjdk.java.net  Wed Jun  1 09:35:38 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 09:35:38 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
Message-ID: <jF66AYGDvlIVwT0ztxEaFwEddN_BIf2TzWYCGApHC3I=.a62e7a0d-991d-4e15-a843-daeb761a6148@github.com>

> Hi all,
> 
> Currently, the CheckWorkItem of the PR bot doesn't re-run the check in the following two situations so that the message of the PR body is not updated and then confuses the developers.
> 
> Situation 1 steps:
> - The issue has no csr at first
> - Use command `/csr needed` (now the PR has `csr` label)
> - Create a csr for this issue
> - Then the CheckWorkItem doesn't re-run the check (Because the `csr` label is kept in the PR and no new metadata found by CheckWorkItem)
> - (optionally) use command `/csr needed` again
> - (optionally) then the CheckWorkItem also doesn't re-run the check
> 
> Situation 2 steps:
> - The issue has no csr at first (now the PR doesn't have `csr` label)
> - Add the new fix version to the existing approved csr. (Now the issue has the csr issue. And because this csr issue had been approved, PR also doesn't have `csr` label.)
> - then the CheckWorkItem doesn't re-run the check (No new metadata found by CheckWorkItem)
> - (optionally) use command `/csr needed`
> - (optionally) then the CheckWorkItem doesn't re-run the check
> 
> It is because these two situations don't add or remove the `csr` label so that the `CheckWorkItem#getMetadata` doesn't return new metadata and then `CheckWorkItem#currentCheckValid` returns true and then the check doesn't re-run.
> 
> This patch adds a new tag/marker named `<!-- csr:` so that `CheckWorkItem#getMetadata` can generate new metadata from it. When the developers use the `/csr` command or the csr issue status has been modified, the CSRBot or CSRCommand will add the `<!-- csr:` tag to the PR body or the comment. Then the CheckWorkItem will re-run the check because `CheckWorkItem#getMetadata` meets the newly added `<!-- csr:` tag.
> 
> Some test cases are added or adjusted.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:

  Only check the Skara generated part. Adjust log. Avoid adding marker multiple times.

-------------

Changes:
  - all: https://git.openjdk.java.net/skara/pull/1327/files
  - new: https://git.openjdk.java.net/skara/pull/1327/files/f5786490..8ce8880f

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1327&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1327&range=00-01

  Stats: 45 lines in 2 files changed: 31 ins; 0 del; 14 mod
  Patch: https://git.openjdk.java.net/skara/pull/1327.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1327/head:pull/1327

PR: https://git.openjdk.java.net/skara/pull/1327

From gli at openjdk.java.net  Wed Jun  1 09:42:17 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Wed, 1 Jun 2022 09:42:17 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
Message-ID: <UCEqvFk5VHe17cylOXqxvbE5_tn3hhwv-OoZpxZbmF0=.69f87d98-bdbf-4363-aae8-a6585e2da857@github.com>

On Tue, 31 May 2022 17:58:26 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Only check the Skara generated part. Adjust log. Avoid adding marker multiple times.
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CSRCommand.java line 37:
> 
>> 35:     private static final String CSR_LABEL = "csr";
>> 36:     private static final String CSR_NEEDED_MARKER = "<!-- csr: 'needed' -->";
>> 37:     private static final String CSR_UNNEEDED_MARKER = "<!-- csr: 'unneeded' -->";
> 
> Did you intend to look for this in the CSRBot?

> (optionally) use command /csr needed again
> (optionally) then the CheckWorkItem also doesn't re-run the check

Sometimes the developers may use the `/csr` command again. I would like to let the CheckWorkItem re-run the check immediately instead of waiting for JEPBot, which may reduce about 10 minutes.

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From erikj at openjdk.java.net  Fri Jun  3 23:25:19 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Fri, 3 Jun 2022 23:25:19 GMT
Subject: RFR: SKARA-1119: A bot should remind a PR author not to force push
 [v2]
In-Reply-To: <kVzW-XxkYJhFp-Ojs1TZt0FjDkkF5peEEoGCols7CVI=.93b244d6-a499-4d1d-9d48-3aaca72559ce@github.com>
References: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
 <kVzW-XxkYJhFp-Ojs1TZt0FjDkkF5peEEoGCols7CVI=.93b244d6-a499-4d1d-9d48-3aaca72559ce@github.com>
Message-ID: <O0O1DLkpCbEqyYD-72biHjnwKYmj-uTEcEJI7UzUu90=.a503c264-372f-4cf0-ba31-88a8374073af@github.com>

On Wed, 1 Jun 2022 08:30:21 GMT, Guoxiong Li <gli at openjdk.org> wrote:

>> Hi all,
>> 
>> This patch adds a suggestion comment to the PR when the developers force-push the branch each time. Because I can't find the related rest api of the GitLab so I only implement it for GitHub.
>> 
>> Thanks for taking the time to review.
>> 
>> Best Regards,
>> -- Guoxiong
>
> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Fix suggestion comment.

Marked as reviewed by erikj (Lead).

-------------

PR: https://git.openjdk.java.net/skara/pull/1328

From erikj at openjdk.java.net  Fri Jun  3 23:25:58 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Fri, 3 Jun 2022 23:25:58 GMT
Subject: RFR: 1410: The reply message of the 'reviewers' command should be
 more accurate [v2]
In-Reply-To: <dTw95asAmjHND0V1Wyh214mtTdl3TDTrL8kYfl53reg=.adc4b70b-7b7e-4833-8213-0dcc343feb9d@github.com>
References: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
 <dTw95asAmjHND0V1Wyh214mtTdl3TDTrL8kYfl53reg=.adc4b70b-7b7e-4833-8213-0dcc343feb9d@github.com>
Message-ID: <a22fzC9BddQFBIoEhKjxsLHFuYyKvsdwXeSWC03rYiE=.3bbeeb91-f9a9-4dbf-86b3-2ee91b728681@github.com>

On Wed, 1 Jun 2022 08:34:37 GMT, Guoxiong Li <gli at openjdk.org> wrote:

>> Hi all,
>> 
>> This trivial patch fixes the reply message of the `reviewers` command.
>> 
>> Thanks for taking the time to review.
>> 
>> Best Regards,
>> -- Guoxiong
>
> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Fix comment.

Marked as reviewed by erikj (Lead).

-------------

PR: https://git.openjdk.java.net/skara/pull/1326

From erikj at openjdk.java.net  Fri Jun  3 23:26:22 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Fri, 3 Jun 2022 23:26:22 GMT
Subject: RFR: 1466: Empty backport causes endless retries of command
Message-ID: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>

If a user tries to /backport a commit that results in an empty change, the BackportCommand fails to realize this and just errors out. It will then endlessly retry the command. This patch makes the BackportCommand detect an empty change and report it to the user.

-------------

Commit messages:
 - SKARA-1466

Changes: https://git.openjdk.java.net/skara/pull/1329/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1329&range=00
  Issue: https://bugs.openjdk.java.net/browse/SKARA-1466
  Stats: 50 lines in 2 files changed: 50 ins; 0 del; 0 mod
  Patch: https://git.openjdk.java.net/skara/pull/1329.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1329/head:pull/1329

PR: https://git.openjdk.java.net/skara/pull/1329

From gli at openjdk.java.net  Sat Jun  4 07:50:40 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Sat, 4 Jun 2022 07:50:40 GMT
Subject: RFR: 1410: The reply message of the 'reviewers' command should be
 more accurate [v2]
In-Reply-To: <a22fzC9BddQFBIoEhKjxsLHFuYyKvsdwXeSWC03rYiE=.3bbeeb91-f9a9-4dbf-86b3-2ee91b728681@github.com>
References: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
 <dTw95asAmjHND0V1Wyh214mtTdl3TDTrL8kYfl53reg=.adc4b70b-7b7e-4833-8213-0dcc343feb9d@github.com>
 <a22fzC9BddQFBIoEhKjxsLHFuYyKvsdwXeSWC03rYiE=.3bbeeb91-f9a9-4dbf-86b3-2ee91b728681@github.com>
Message-ID: <qcdfYDqY-UZNYSaSYY4nJ36nxgOi_z6HkORRpbmrXOU=.5c8f584b-06bc-43cf-af8b-1881dd193930@github.com>

On Fri, 3 Jun 2022 23:23:56 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Fix comment.
>
> Marked as reviewed by erikj (Lead).

@erikj79 Thanks for the review. Integrating.

-------------

PR: https://git.openjdk.java.net/skara/pull/1326

From gli at openjdk.java.net  Sat Jun  4 07:50:40 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Sat, 4 Jun 2022 07:50:40 GMT
Subject: Integrated: 1410: The reply message of the 'reviewers' command should
 be more accurate
In-Reply-To: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
References: <Dk7utyaGwY8PnbA0yJ5Iw4420fF5dBCtYdpPfWxjhyU=.ae1e8515-0cdf-4ef2-b11f-b5bf7454fbe2@github.com>
Message-ID: <YdDQ43IFRplJczl89f557w42A3ZmdwdGi0ziaPxCmAA=.2bc14548-e793-4708-8f89-3a13bc8de883@github.com>

On Sat, 28 May 2022 09:17:55 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> This trivial patch fixes the reply message of the `reviewers` command.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

This pull request has now been integrated.

Changeset: fd17f61d
Author:    Guoxiong Li <gli at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/fd17f61dfca8bf27cfc76b21da33e7b82c4e4404
Stats:     17 lines in 2 files changed: 14 ins; 0 del; 3 mod

1410: The reply message of the 'reviewers' command should be more accurate

Reviewed-by: erikj

-------------

PR: https://git.openjdk.java.net/skara/pull/1326

From gli at openjdk.java.net  Sat Jun  4 07:51:29 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Sat, 4 Jun 2022 07:51:29 GMT
Subject: Integrated: SKARA-1119: A bot should remind a PR author not to force
 push
In-Reply-To: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
References: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
Message-ID: <smtZ7SCyROJGe8FFw42DDhDwPTb5br8HUfXzut8QyTQ=.f4f4424a-ead6-4a3c-ac13-48b8b5880333@github.com>

On Sun, 29 May 2022 13:30:26 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> This patch adds a suggestion comment to the PR when the developers force-push the branch each time. Because I can't find the related rest api of the GitLab so I only implement it for GitHub.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

This pull request has now been integrated.

Changeset: 2ba31183
Author:    Guoxiong Li <gli at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/2ba3118357b945cf8b200af412eba3bcb306a615
Stats:     163 lines in 9 files changed: 159 ins; 0 del; 4 mod

1119: A bot should remind a PR author not to force push
225: Notify when commits are force pushed to a branch

Reviewed-by: erikj

-------------

PR: https://git.openjdk.java.net/skara/pull/1328

From gli at openjdk.java.net  Sat Jun  4 07:51:29 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Sat, 4 Jun 2022 07:51:29 GMT
Subject: RFR: SKARA-1119: A bot should remind a PR author not to force push
 [v2]
In-Reply-To: <O0O1DLkpCbEqyYD-72biHjnwKYmj-uTEcEJI7UzUu90=.a503c264-372f-4cf0-ba31-88a8374073af@github.com>
References: <CekZCGNnVDvT9B_lOiqaVdzdp84QJtgMOaEk1Is5Npk=.e013b8ff-4aa1-4517-a443-c835f644c185@github.com>
 <kVzW-XxkYJhFp-Ojs1TZt0FjDkkF5peEEoGCols7CVI=.93b244d6-a499-4d1d-9d48-3aaca72559ce@github.com>
 <O0O1DLkpCbEqyYD-72biHjnwKYmj-uTEcEJI7UzUu90=.a503c264-372f-4cf0-ba31-88a8374073af@github.com>
Message-ID: <WjbkjVNP2DFB4AjgtsKN-Snp8qyB-N2JBOQffTOyV0Y=.18e5e24e-7da4-48eb-819c-892e52b502ff@github.com>

On Fri, 3 Jun 2022 23:23:13 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Fix suggestion comment.
>
> Marked as reviewed by erikj (Lead).

@erikj79 Thanks for the review. Integrating.

-------------

PR: https://git.openjdk.java.net/skara/pull/1328

From erikj at openjdk.java.net  Mon Jun  6 08:12:57 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Mon, 6 Jun 2022 08:12:57 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <UCEqvFk5VHe17cylOXqxvbE5_tn3hhwv-OoZpxZbmF0=.69f87d98-bdbf-4363-aae8-a6585e2da857@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
 <UCEqvFk5VHe17cylOXqxvbE5_tn3hhwv-OoZpxZbmF0=.69f87d98-bdbf-4363-aae8-a6585e2da857@github.com>
Message-ID: <aQar7Li3j1oA69sjXQpE7CkwpcgALxg87BjRj2_s70A=.14791049-2300-42fb-bc39-532d771625ff@github.com>

On Wed, 1 Jun 2022 09:39:14 GMT, Guoxiong Li <gli at openjdk.org> wrote:

>> bots/pr/src/main/java/org/openjdk/skara/bots/pr/CSRCommand.java line 37:
>> 
>>> 35:     private static final String CSR_LABEL = "csr";
>>> 36:     private static final String CSR_NEEDED_MARKER = "<!-- csr: 'needed' -->";
>>> 37:     private static final String CSR_UNNEEDED_MARKER = "<!-- csr: 'unneeded' -->";
>> 
>> Did you intend to look for this in the CSRBot?
>
>> (optionally) use command /csr needed again
>> (optionally) then the CheckWorkItem also doesn't re-run the check
> 
> Sometimes the developers may use the `/csr` command again. I would like to let the CheckWorkItem re-run the check immediately instead of waiting for JEPBot, which may reduce about 10 minutes.

I don't understand what you mean. You set these markers, but I don't see anything looking for them.

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From gli at openjdk.java.net  Mon Jun  6 08:26:19 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Mon, 6 Jun 2022 08:26:19 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <aQar7Li3j1oA69sjXQpE7CkwpcgALxg87BjRj2_s70A=.14791049-2300-42fb-bc39-532d771625ff@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
 <UCEqvFk5VHe17cylOXqxvbE5_tn3hhwv-OoZpxZbmF0=.69f87d98-bdbf-4363-aae8-a6585e2da857@github.com>
 <aQar7Li3j1oA69sjXQpE7CkwpcgALxg87BjRj2_s70A=.14791049-2300-42fb-bc39-532d771625ff@github.com>
Message-ID: <ew3ontkmg211kg2v3xRtV0xL-Rs85YMYxVGCv14mjUk=.02de77cb-e266-4569-b882-c2308143755d@github.com>

On Mon, 6 Jun 2022 08:10:14 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>>> (optionally) use command /csr needed again
>>> (optionally) then the CheckWorkItem also doesn't re-run the check
>> 
>> Sometimes the developers may use the `/csr` command again. I would like to let the CheckWorkItem re-run the check immediately instead of waiting for JEPBot, which may reduce about 10 minutes.
>
> I don't understand what you mean. You set these markers, but I don't see anything looking for them.

// file CheckWorkItem.java
-    private final Pattern metadataComments = Pattern.compile("<!-- (?:(add|remove) (?:contributor|reviewer))|(?:summary: ')|(?:solves: ')|(?:additional required reviewers)|(?:jep: ')");
+    private final Pattern metadataComments = Pattern.compile("<!-- (?:(add|remove) (?:contributor|reviewer))|(?:summary: ')|(?:solves: ')|(?:additional required reviewers)|(?:jep: ')|(?:csr: ')");


The newly added `(?:csr: ')` can search it and update the metadata so that the check can be re-run.

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From erikj at openjdk.java.net  Mon Jun  6 09:16:18 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Mon, 6 Jun 2022 09:16:18 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <jF66AYGDvlIVwT0ztxEaFwEddN_BIf2TzWYCGApHC3I=.a62e7a0d-991d-4e15-a843-daeb761a6148@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <jF66AYGDvlIVwT0ztxEaFwEddN_BIf2TzWYCGApHC3I=.a62e7a0d-991d-4e15-a843-daeb761a6148@github.com>
Message-ID: <svajbKUXz2JwACYG9VURBDBLP3ZB380dwPRytrxillE=.626c1802-1c66-4b2f-87df-3830a50a13ff@github.com>

On Wed, 1 Jun 2022 09:35:38 GMT, Guoxiong Li <gli at openjdk.org> wrote:

>> Hi all,
>> 
>> Currently, the CheckWorkItem of the PR bot doesn't re-run the check in the following two situations so that the message of the PR body is not updated and then confuses the developers.
>> 
>> Situation 1 steps:
>> - The issue has no csr at first
>> - Use command `/csr needed` (now the PR has `csr` label)
>> - Create a csr for this issue
>> - Then the CheckWorkItem doesn't re-run the check (Because the `csr` label is kept in the PR and no new metadata found by CheckWorkItem)
>> - (optionally) use command `/csr needed` again
>> - (optionally) then the CheckWorkItem also doesn't re-run the check
>> 
>> Situation 2 steps:
>> - The issue has no csr at first (now the PR doesn't have `csr` label)
>> - Add the new fix version to the existing approved csr. (Now the issue has the csr issue. And because this csr issue had been approved, PR also doesn't have `csr` label.)
>> - then the CheckWorkItem doesn't re-run the check (No new metadata found by CheckWorkItem)
>> - (optionally) use command `/csr needed`
>> - (optionally) then the CheckWorkItem doesn't re-run the check
>> 
>> It is because these two situations don't add or remove the `csr` label so that the `CheckWorkItem#getMetadata` doesn't return new metadata and then `CheckWorkItem#currentCheckValid` returns true and then the check doesn't re-run.
>> 
>> This patch adds a new tag/marker named `<!-- csr:` so that `CheckWorkItem#getMetadata` can generate new metadata from it. When the developers use the `/csr` command or the csr issue status has been modified, the CSRBot or CSRCommand will add the `<!-- csr:` tag to the PR body or the comment. Then the CheckWorkItem will re-run the check because `CheckWorkItem#getMetadata` meets the newly added `<!-- csr:` tag.
>> 
>> Some test cases are added or adjusted.
>> 
>> Thanks for taking the time to review.
>> 
>> Best Regards,
>> -- Guoxiong
>
> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Only check the Skara generated part. Adjust log. Avoid adding marker multiple times.

Marked as reviewed by erikj (Lead).

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From erikj at openjdk.java.net  Mon Jun  6 09:16:18 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Mon, 6 Jun 2022 09:16:18 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <ew3ontkmg211kg2v3xRtV0xL-Rs85YMYxVGCv14mjUk=.02de77cb-e266-4569-b882-c2308143755d@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <-MDfjgv6xlvMPuzvOzYAorhO9eNjpw5rgvVb54-9RKs=.950c1faa-35a6-4c04-904f-a9dc35285691@github.com>
 <UCEqvFk5VHe17cylOXqxvbE5_tn3hhwv-OoZpxZbmF0=.69f87d98-bdbf-4363-aae8-a6585e2da857@github.com>
 <aQar7Li3j1oA69sjXQpE7CkwpcgALxg87BjRj2_s70A=.14791049-2300-42fb-bc39-532d771625ff@github.com>
 <ew3ontkmg211kg2v3xRtV0xL-Rs85YMYxVGCv14mjUk=.02de77cb-e266-4569-b882-c2308143755d@github.com>
Message-ID: <42QMbLBtHpTP3rwkYm3o1sIc81miwQzdzoajsLvUcS0=.b1f89176-b62c-4317-a657-6702bcbc1760@github.com>

On Mon, 6 Jun 2022 08:23:26 GMT, Guoxiong Li <gli at openjdk.org> wrote:

>> I don't understand what you mean. You set these markers, but I don't see anything looking for them.
>
> // file CheckWorkItem.java
> -    private final Pattern metadataComments = Pattern.compile("<!-- (?:(add|remove) (?:contributor|reviewer))|(?:summary: ')|(?:solves: ')|(?:additional required reviewers)|(?:jep: ')");
> +    private final Pattern metadataComments = Pattern.compile("<!-- (?:(add|remove) (?:contributor|reviewer))|(?:summary: ')|(?:solves: ')|(?:additional required reviewers)|(?:jep: ')|(?:csr: ')");
> 
> 
> The newly added `(?:csr: ')` of the `metadataComments` can search it and update the metadata so that the check can be re-run.

Ah of course, thanks.

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From gli at openjdk.java.net  Mon Jun  6 09:30:58 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Mon, 6 Jun 2022 09:30:58 GMT
Subject: RFR: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check [v2]
In-Reply-To: <svajbKUXz2JwACYG9VURBDBLP3ZB380dwPRytrxillE=.626c1802-1c66-4b2f-87df-3830a50a13ff@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
 <jF66AYGDvlIVwT0ztxEaFwEddN_BIf2TzWYCGApHC3I=.a62e7a0d-991d-4e15-a843-daeb761a6148@github.com>
 <svajbKUXz2JwACYG9VURBDBLP3ZB380dwPRytrxillE=.626c1802-1c66-4b2f-87df-3830a50a13ff@github.com>
Message-ID: <xVZfqrK2LvScI9y6f40gESfO86bY4bsEBKkEk58AJKs=.e8a91a4d-427a-441d-90a7-23411b96ef77@github.com>

On Mon, 6 Jun 2022 09:13:21 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Guoxiong Li has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Only check the Skara generated part. Adjust log. Avoid adding marker multiple times.
>
> Marked as reviewed by erikj (Lead).

@erikj79 Thanks for the review. Integrating.

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From gli at openjdk.java.net  Mon Jun  6 09:30:59 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Mon, 6 Jun 2022 09:30:59 GMT
Subject: Integrated: 1433: The change of the CSR status doesn't force the
 CheckWorkItem to re-run the check
In-Reply-To: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
References: <VVWkjhep36MUrB6u6ZD6XCh_OhWKJUROxObgGt1LXd0=.6a7c9aa4-1137-46fd-8825-a2872b2cce7c@github.com>
Message-ID: <9Lt0AKj7mgoOW-useuSWzLi2KH9LMGfC9j3iCufH-AM=.c252bd3c-9f4a-499b-9f06-2e21470cfb27@github.com>

On Sat, 28 May 2022 16:47:51 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> Currently, the CheckWorkItem of the PR bot doesn't re-run the check in the following two situations so that the message of the PR body is not updated and then confuses the developers.
> 
> Situation 1 steps:
> - The issue has no csr at first
> - Use command `/csr needed` (now the PR has `csr` label)
> - Create a csr for this issue
> - Then the CheckWorkItem doesn't re-run the check (Because the `csr` label is kept in the PR and no new metadata found by CheckWorkItem)
> - (optionally) use command `/csr needed` again
> - (optionally) then the CheckWorkItem also doesn't re-run the check
> 
> Situation 2 steps:
> - The issue has no csr at first (now the PR doesn't have `csr` label)
> - Add the new fix version to the existing approved csr. (Now the issue has the csr issue. And because this csr issue had been approved, PR also doesn't have `csr` label.)
> - then the CheckWorkItem doesn't re-run the check (No new metadata found by CheckWorkItem)
> - (optionally) use command `/csr needed`
> - (optionally) then the CheckWorkItem doesn't re-run the check
> 
> It is because these two situations don't add or remove the `csr` label so that the `CheckWorkItem#getMetadata` doesn't return new metadata and then `CheckWorkItem#currentCheckValid` returns true and then the check doesn't re-run.
> 
> This patch adds a new tag/marker named `<!-- csr:` so that `CheckWorkItem#getMetadata` can generate new metadata from it. When the developers use the `/csr` command or the csr issue status has been modified, the CSRBot or CSRCommand will add the `<!-- csr:` tag to the PR body or the comment. Then the CheckWorkItem will re-run the check because `CheckWorkItem#getMetadata` meets the newly added `<!-- csr:` tag.
> 
> Some test cases are added or adjusted.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

This pull request has now been integrated.

Changeset: 06fdf7c8
Author:    Guoxiong Li <gli at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/06fdf7c8d5313ee81c5fa471d8d05267f4f02fa7
Stats:     191 lines in 6 files changed: 149 ins; 16 del; 26 mod

1433: The change of the CSR status doesn't force the CheckWorkItem to re-run the check

Reviewed-by: erikj

-------------

PR: https://git.openjdk.java.net/skara/pull/1327

From erikj at openjdk.java.net  Mon Jun  6 10:00:59 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Mon, 6 Jun 2022 10:00:59 GMT
Subject: RFR: 1465: Using altfixversions prevents commit comments
Message-ID: <qwkpBmgnrBZg1cebDPALyW6gq22FY1SCmjT22HHE384=.18065570-2eac-463f-92e6-c411ae41e8e1@github.com>

The altfixversions feature introduced in [SKARA-1213](https://bugs.openjdk.java.net/browse/SKARA-1213) had the unfortunate side effect of also blocking additional commit comments from being added to existing backports. I think this needs to be fixed as those additional commit comments help integrators track where and when changes move between different repos.

This patch fixes this and adjusts the relevant test.

-------------

Commit messages:
 - SKARA-1465

Changes: https://git.openjdk.java.net/skara/pull/1330/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1330&range=00
  Issue: https://bugs.openjdk.java.net/browse/SKARA-1465
  Stats: 9 lines in 2 files changed: 7 ins; 0 del; 2 mod
  Patch: https://git.openjdk.java.net/skara/pull/1330.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1330/head:pull/1330

PR: https://git.openjdk.java.net/skara/pull/1330

From rwestrel at redhat.com  Tue Jun  7 07:53:22 2022
From: rwestrel at redhat.com (Roland Westrelin)
Date: Tue, 07 Jun 2022 09:53:22 +0200
Subject: git pr create command no longer working?
Message-ID: <87czfk7vv1.fsf@redhat.com>


Hi!

git pr create doesn't seem to work anymore. See below. I've just ran git
skara update.

Thanks,
Roland.

[rwestrel at rwestrel jdk-jdk]$ git pr create --draft
The following mailing lists will be CC:d for the "RFR" e-mail:
- hotspot-compiler-dev at openjdk.java.net

Do you want to proceed with this mailing list selection? [Y/n]: 
Exception in thread "main" java.lang.IllegalStateException: [0]: not a valid start of a JSON value : <html>
<head><title>301 Moved Permanently</title></head>
<body>
<center><h1>301 Moved Permanently</h1></center>
<hr><center></center>
</body>
</html>

	at org.openjdk.skara.json/org.openjdk.skara.json.JSONParser.failure(JSONParser.java:43)
	at org.openjdk.skara.json/org.openjdk.skara.json.JSONParser.parseValue(JSONParser.java:444)
	at org.openjdk.skara.json/org.openjdk.skara.json.JSONParser.parse(JSONParser.java:464)
	at org.openjdk.skara.json/org.openjdk.skara.json.JSON.parse(JSON.java:27)
	at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.parseResponse(RestRequest.java:363)
	at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest.execute(RestRequest.java:486)
	at org.openjdk.skara.network/org.openjdk.skara.network.RestRequest$QueryBuilder.execute(RestRequest.java:207)
	at org.openjdk.skara.issuetracker/org.openjdk.skara.issuetracker.jira.JiraProject.issue(JiraProject.java:429)
	at org.openjdk.skara.cli/org.openjdk.skara.cli.pr.Utils.getIssue(Utils.java:221)
	at org.openjdk.skara.cli/org.openjdk.skara.cli.pr.Utils.getIssue(Utils.java:210)
	at org.openjdk.skara.cli/org.openjdk.skara.cli.pr.Utils.getIssue(Utils.java:206)
	at org.openjdk.skara.cli/org.openjdk.skara.cli.pr.GitPrCreate.main(GitPrCreate.java:386)
	at org.openjdk.skara.args/org.openjdk.skara.args.Command.main(Command.java:54)
	at org.openjdk.skara.args/org.openjdk.skara.args.MultiCommandParser.lambda$parse$2(MultiCommandParser.java:65)
	at org.openjdk.skara.cli/org.openjdk.skara.cli.GitPr.main(GitPr.java:111)
	at org.openjdk.skara.cli/org.openjdk.skara.cli.GitSkara.main(GitSkara.java:231)


From ehelin at openjdk.java.net  Tue Jun  7 09:30:32 2022
From: ehelin at openjdk.java.net (Erik Helin)
Date: Tue, 7 Jun 2022 09:30:32 GMT
Subject: RFR: 1466: Empty backport causes endless retries of command
In-Reply-To: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>
References: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>
Message-ID: <Pdj8gmX4r_y4Haix-JfMZCrZ-HjRansINsQXL2FF5aI=.aed7d1d0-45df-4583-bc87-5288f0d28189@github.com>

On Fri, 3 Jun 2022 23:21:59 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> If a user tries to /backport a commit that results in an empty change, the BackportCommand fails to realize this and just errors out. It will then endlessly retry the command. This patch makes the BackportCommand detect an empty change and report it to the user.

Looks good!

-------------

Marked as reviewed by ehelin (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/1329

From ihse at openjdk.java.net  Tue Jun  7 09:58:47 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 7 Jun 2022 09:58:47 GMT
Subject: RFR: 1466: Empty backport causes endless retries of command
In-Reply-To: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>
References: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>
Message-ID: <IjoubhOiSG36TmVGVf4zUMU4PDLflE9xNfWxnV9Fe7o=.34f91a0b-bd41-4aad-835d-a1dd34de05fa@github.com>

On Fri, 3 Jun 2022 23:21:59 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> If a user tries to /backport a commit that results in an empty change, the BackportCommand fails to realize this and just errors out. It will then endlessly retry the command. This patch makes the BackportCommand detect an empty change and report it to the user.

LGTM

-------------

Marked as reviewed by ihse (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/1329

From ihse at openjdk.java.net  Tue Jun  7 10:01:42 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 7 Jun 2022 10:01:42 GMT
Subject: RFR: 1465: Using altfixversions prevents commit comments
In-Reply-To: <qwkpBmgnrBZg1cebDPALyW6gq22FY1SCmjT22HHE384=.18065570-2eac-463f-92e6-c411ae41e8e1@github.com>
References: <qwkpBmgnrBZg1cebDPALyW6gq22FY1SCmjT22HHE384=.18065570-2eac-463f-92e6-c411ae41e8e1@github.com>
Message-ID: <R9IKtTm4Tym2M7wab0Od6NfqBy2FgIcrs0i3RwT1yLM=.102b48e4-b5d2-489d-af17-d1fd594dc822@github.com>

On Mon, 6 Jun 2022 09:56:30 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The altfixversions feature introduced in [SKARA-1213](https://bugs.openjdk.java.net/browse/SKARA-1213) had the unfortunate side effect of also blocking additional commit comments from being added to existing backports. I think this needs to be fixed as those additional commit comments help integrators track where and when changes move between different repos.
> 
> This patch fixes this and adjusts the relevant test.

LGTM

-------------

Marked as reviewed by ihse (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/1330

From gli at openjdk.java.net  Tue Jun  7 11:30:37 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Tue, 7 Jun 2022 11:30:37 GMT
Subject: RFR: 1432: The command `/csr unneeded` doesn't correctly handle an
 approved CSR
Message-ID: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>

Hi all,

Currently, when using the command `/csr unneeded` and the PR doesn't have `csr` label, the `CSRCommand` can't distinguish the situations of having no csr request and having an approved csr request. This patch removes the conditional statement `labels.contains(CSR_LABEL)` of the method `CSRCommand::handle` so that its following code can distinguish the different situations and reply different messages.

And the code about removing `csr` label is moved to the method `csrUnneededReply` to reduce some duplication.

Thanks for taking the time to review.

Best Regards,
-- Guoxiong

-------------

Commit messages:
 - SKARA-1432

Changes: https://git.openjdk.java.net/skara/pull/1331/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1331&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1432
  Stats: 29 lines in 2 files changed: 10 ins; 11 del; 8 mod
  Patch: https://git.openjdk.java.net/skara/pull/1331.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1331/head:pull/1331

PR: https://git.openjdk.java.net/skara/pull/1331

From ihse at openjdk.java.net  Tue Jun  7 11:57:57 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 7 Jun 2022 11:57:57 GMT
Subject: RFR: 1432: The command `/csr unneeded` doesn't correctly handle an
 approved CSR
In-Reply-To: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
References: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
Message-ID: <UbShem0GFAe4sZUqGzwgwOhdEO9tMLHFmcpYsJ9JhGo=.c635738a-da4b-4d3b-a07f-2328c3a4c3a1@github.com>

On Tue, 7 Jun 2022 11:26:16 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> Currently, when using the command `/csr unneeded` and the PR doesn't have `csr` label, the `CSRCommand` can't distinguish the situations of having no csr request and having an approved csr request. This patch removes the conditional statement `labels.contains(CSR_LABEL)` of the method `CSRCommand::handle` so that its following code can distinguish the different situations and reply different messages.
> 
> And the code about removing `csr` label is moved to the method `csrUnneededReply` to reduce some duplication.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

Looks good to me.

-------------

Marked as reviewed by ihse (Reviewer).

PR: https://git.openjdk.java.net/skara/pull/1331

From lgxbslgx at gmail.com  Tue Jun  7 12:06:23 2022
From: lgxbslgx at gmail.com (Guoxiong Li)
Date: Tue, 7 Jun 2022 20:06:23 +0800
Subject: git pr create command no longer working?
In-Reply-To: <87czfk7vv1.fsf@redhat.com>
References: <87czfk7vv1.fsf@redhat.com>
Message-ID: <CAPSsVqgDb2WQrFgLeDmwCARH6F=BFeNbg8x8-eGmfsTrb-+LmQ@mail.gmail.com>

Hi Roland,

Thanks for reporting the bug.

The SKARA pre-submit tests [1] fail too.
It is caused by the recent domain change of the JBS (from `
bugs.openjdk.java.net` to `bugs.openjdk.org`).
The related issue[2] was created.

[1] https://github.com/lgxbslgx/skara/actions/runs/2454139328
[2] https://bugs.openjdk.org/browse/SKARA-1467

Best Regards,
-- Guoxiong

From erikj at openjdk.java.net  Tue Jun  7 12:55:17 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 7 Jun 2022 12:55:17 GMT
Subject: RFR: 1432: The command `/csr unneeded` doesn't correctly handle an
 approved CSR
In-Reply-To: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
References: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
Message-ID: <PhwIbRF127_Lir8ideHoom10nFxD_KroITf7WXztfho=.d52f1a0a-3148-442b-b456-6eceab76167b@github.com>

On Tue, 7 Jun 2022 11:26:16 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> Currently, when using the command `/csr unneeded` and the PR doesn't have `csr` label, the `CSRCommand` can't distinguish the situations of having no csr request and having an approved csr request. This patch removes the conditional statement `labels.contains(CSR_LABEL)` of the method `CSRCommand::handle` so that its following code can distinguish the different situations and reply different messages.
> 
> And the code about removing `csr` label is moved to the method `csrUnneededReply` to reduce some duplication.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

Marked as reviewed by erikj (Lead).

-------------

PR: https://git.openjdk.java.net/skara/pull/1331

From erikj at openjdk.java.net  Tue Jun  7 13:09:30 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 7 Jun 2022 13:09:30 GMT
Subject: Integrated: 1465: Using altfixversions prevents commit comments
In-Reply-To: <qwkpBmgnrBZg1cebDPALyW6gq22FY1SCmjT22HHE384=.18065570-2eac-463f-92e6-c411ae41e8e1@github.com>
References: <qwkpBmgnrBZg1cebDPALyW6gq22FY1SCmjT22HHE384=.18065570-2eac-463f-92e6-c411ae41e8e1@github.com>
Message-ID: <DqhMA2b_smttk4V5eDWNk_2qA86r9vhDiF6L36mP57I=.933519ae-58ec-4352-adfa-cf71ec732225@github.com>

On Mon, 6 Jun 2022 09:56:30 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The altfixversions feature introduced in [SKARA-1213](https://bugs.openjdk.java.net/browse/SKARA-1213) had the unfortunate side effect of also blocking additional commit comments from being added to existing backports. I think this needs to be fixed as those additional commit comments help integrators track where and when changes move between different repos.
> 
> This patch fixes this and adjusts the relevant test.

This pull request has now been integrated.

Changeset: 58e51ca6
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/58e51ca6fe6a3143096f9d62f7287ba65d1ee998
Stats:     9 lines in 2 files changed: 7 ins; 0 del; 2 mod

1465: Using altfixversions prevents commit comments

Reviewed-by: ihse

-------------

PR: https://git.openjdk.java.net/skara/pull/1330

From erikj at openjdk.java.net  Tue Jun  7 13:09:42 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 7 Jun 2022 13:09:42 GMT
Subject: Integrated: 1466: Empty backport causes endless retries of command
In-Reply-To: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>
References: <uOZUA18u55Ax2uQoT6ENfYCkJehIDggnvVHsruaPTOU=.869bd42f-6d50-4586-ac4c-0a043b3947fd@github.com>
Message-ID: <eNzbL1PyxaaF9-AnviFWuz56lkYvD6tjYjmFTOw256E=.d6da6379-5edf-4745-a896-c428cc575129@github.com>

On Fri, 3 Jun 2022 23:21:59 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> If a user tries to /backport a commit that results in an empty change, the BackportCommand fails to realize this and just errors out. It will then endlessly retry the command. This patch makes the BackportCommand detect an empty change and report it to the user.

This pull request has now been integrated.

Changeset: cc87e695
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/cc87e695e424f505582189c102d4fef4478cd061
Stats:     50 lines in 2 files changed: 50 ins; 0 del; 0 mod

1466: Empty backport causes endless retries of command

Reviewed-by: ehelin, ihse

-------------

PR: https://git.openjdk.java.net/skara/pull/1329

From lgxbslgx at gmail.com  Tue Jun  7 14:06:57 2022
From: lgxbslgx at gmail.com (Guoxiong Li)
Date: Tue, 7 Jun 2022 22:06:57 +0800
Subject: The github user `openjdk-notifier` is not marked as ignored user in
 mlbridge bot
Message-ID: <CAPSsVqgXXV8=qhP_6X1wZc_a3=nSOYcVq74V8rYoqG5DEsKjFA@mail.gmail.com>

Hi all,

After integrating SKARA-1119 [1][2], when the developers force-push to the
PR,
the notifier bot will add a comment in the PR by using the github username
`openjdk-notifier`
to notify the developers not to do that again.

But unfortunately, the mlbridge bot doesn't ignore the comments of
`openjdk-notifier`
so that the mlbridge bot will send emails of such comments to the maillist.
An example is listed at [3][4].

It is good to add `openjdk-notifier` to the ignored user list of the
mlbridge bot.
The related code about the configuration in the
`MailingListBridgeBotFactory` is listed below.

```
        var ignoredUsers = specific.get("ignored").get("users").stream()
                                   .map(JSONValue::asString)
```

[1] https://bugs.openjdk.java.net/browse/SKARA-1119
[2]
https://github.com/openjdk/skara/commit/2ba3118357b945cf8b200af412eba3bcb306a615
[3] https://github.com/openjdk/jdk/pull/9049
[4]
https://mail.openjdk.java.net/pipermail/compiler-dev/2022-June/019920.html

Best Regards,
-- Guoxiong

From erik.joelsson at oracle.com  Tue Jun  7 14:15:30 2022
From: erik.joelsson at oracle.com (erik.joelsson at oracle.com)
Date: Tue, 7 Jun 2022 16:15:30 +0200
Subject: The github user `openjdk-notifier` is not marked as ignored user
 in mlbridge bot
In-Reply-To: <CAPSsVqgXXV8=qhP_6X1wZc_a3=nSOYcVq74V8rYoqG5DEsKjFA@mail.gmail.com>
References: <CAPSsVqgXXV8=qhP_6X1wZc_a3=nSOYcVq74V8rYoqG5DEsKjFA@mail.gmail.com>
Message-ID: <4baf6016-37d4-5e06-e541-512c5e420277@oracle.com>

I will look into it.

/Erik

On 6/7/22 16:06, Guoxiong Li wrote:
> Hi all,
>
> After integrating SKARA-1119 [1][2], when the developers force-push to the
> PR,
> the notifier bot will add a comment in the PR by using the github username
> `openjdk-notifier`
> to notify the developers not to do that again.
>
> But unfortunately, the mlbridge bot doesn't ignore the comments of
> `openjdk-notifier`
> so that the mlbridge bot will send emails of such comments to the maillist.
> An example is listed at [3][4].
>
> It is good to add `openjdk-notifier` to the ignored user list of the
> mlbridge bot.
> The related code about the configuration in the
> `MailingListBridgeBotFactory` is listed below.
>
> ```
>          var ignoredUsers = specific.get("ignored").get("users").stream()
>                                     .map(JSONValue::asString)
> ```
>
> [1] https://bugs.openjdk.java.net/browse/SKARA-1119
> [2]
> https://github.com/openjdk/skara/commit/2ba3118357b945cf8b200af412eba3bcb306a615
> [3] https://github.com/openjdk/jdk/pull/9049
> [4]
> https://mail.openjdk.java.net/pipermail/compiler-dev/2022-June/019920.html
>
> Best Regards,
> -- Guoxiong

From erikj at openjdk.java.net  Tue Jun  7 14:35:29 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 7 Jun 2022 14:35:29 GMT
Subject: RFR: 1467: Update JBS URL in Skara src
Message-ID: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>

This patch changes all bugs and github.openjdk.java.net references to openjdk.org.

-------------

Commit messages:
 - SKARA-1467

Changes: https://git.openjdk.java.net/skara/pull/1332/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1332&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1467
  Stats: 19 lines in 13 files changed: 0 ins; 0 del; 19 mod
  Patch: https://git.openjdk.java.net/skara/pull/1332.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1332/head:pull/1332

PR: https://git.openjdk.java.net/skara/pull/1332

From gli at openjdk.java.net  Tue Jun  7 15:30:08 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Tue, 7 Jun 2022 15:30:08 GMT
Subject: RFR: 1467: Update JBS URL in Skara src
In-Reply-To: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>
References: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>
Message-ID: <04GNdmu_4vDnvtxFPeLhGLb4mYN7iPjwsH1g_ohU9lA=.d1ca732d-cc06-4b4e-b308-bb5465f4a4cd@github.com>

On Tue, 7 Jun 2022 14:30:50 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch changes all bugs and github.openjdk.java.net references to openjdk.org.

LGTM

-------------

Marked as reviewed by gli (Committer).

PR: https://git.openjdk.java.net/skara/pull/1332

From gli at openjdk.java.net  Tue Jun  7 15:31:31 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Tue, 7 Jun 2022 15:31:31 GMT
Subject: RFR: 1432: The command `/csr unneeded` doesn't correctly handle an
 approved CSR
In-Reply-To: <UbShem0GFAe4sZUqGzwgwOhdEO9tMLHFmcpYsJ9JhGo=.c635738a-da4b-4d3b-a07f-2328c3a4c3a1@github.com>
References: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
 <UbShem0GFAe4sZUqGzwgwOhdEO9tMLHFmcpYsJ9JhGo=.c635738a-da4b-4d3b-a07f-2328c3a4c3a1@github.com>
Message-ID: <LZN7QY06Rb572JoQyLlJPn0ASQysIY6NtQfjoHSk9c4=.0fe64f72-35d0-4046-9ca1-b4551ab8a9c3@github.com>

On Tue, 7 Jun 2022 11:54:57 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

>> Hi all,
>> 
>> Currently, when using the command `/csr unneeded` and the PR doesn't have `csr` label, the `CSRCommand` can't distinguish the situations of having no csr request and having an approved csr request. This patch removes the conditional statement `labels.contains(CSR_LABEL)` of the method `CSRCommand::handle` so that its following code can distinguish the different situations and reply different messages.
>> 
>> And the code about removing `csr` label is moved to the method `csrUnneededReply` to reduce some duplication.
>> 
>> Thanks for taking the time to review.
>> 
>> Best Regards,
>> -- Guoxiong
>
> Looks good to me.

@magicus @erikj79 Thanks for the review. Integrating.

-------------

PR: https://git.openjdk.java.net/skara/pull/1331

From gli at openjdk.java.net  Tue Jun  7 15:31:31 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Tue, 7 Jun 2022 15:31:31 GMT
Subject: Integrated: 1432: The command `/csr unneeded` doesn't correctly handle
 an approved CSR
In-Reply-To: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
References: <PN8_WLkW8FGTQubUg0OFxVsOAaZ_e6i0-Dpq24xGiks=.00deb364-2315-4d44-be03-c697fedc37b5@github.com>
Message-ID: <uQkwKRk6rYiuaqkBrcHOpyT2T7sIinN9KQE9FIzt2nY=.96ba3ac0-6f53-49a0-a86d-99a3fa18688a@github.com>

On Tue, 7 Jun 2022 11:26:16 GMT, Guoxiong Li <gli at openjdk.org> wrote:

> Hi all,
> 
> Currently, when using the command `/csr unneeded` and the PR doesn't have `csr` label, the `CSRCommand` can't distinguish the situations of having no csr request and having an approved csr request. This patch removes the conditional statement `labels.contains(CSR_LABEL)` of the method `CSRCommand::handle` so that its following code can distinguish the different situations and reply different messages.
> 
> And the code about removing `csr` label is moved to the method `csrUnneededReply` to reduce some duplication.
> 
> Thanks for taking the time to review.
> 
> Best Regards,
> -- Guoxiong

This pull request has now been integrated.

Changeset: 46b0e597
Author:    Guoxiong Li <gli at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/46b0e597c478d28c3c8eec2baf7bc5c91d0e1bba
Stats:     29 lines in 2 files changed: 10 ins; 11 del; 8 mod

1432: The command `/csr unneeded` doesn't correctly handle an approved CSR

Reviewed-by: ihse, erikj

-------------

PR: https://git.openjdk.java.net/skara/pull/1331

From darcy at openjdk.java.net  Tue Jun  7 15:45:32 2022
From: darcy at openjdk.java.net (Joe Darcy)
Date: Tue, 7 Jun 2022 15:45:32 GMT
Subject: RFR: 1467: Update JBS URL in Skara src
In-Reply-To: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>
References: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>
Message-ID: <lgCD1VeGhe9SY3e8FKe_j5BYIp19wVjC7f8vhc9x-cY=.9ad34d8a-b236-4433-b8a3-79b6acbf8735@github.com>

On Tue, 7 Jun 2022 14:30:50 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch changes all bugs and github.openjdk.java.net references to openjdk.org.

Marked as reviewed by darcy (Reviewer).

-------------

PR: https://git.openjdk.java.net/skara/pull/1332

From erikj at openjdk.java.net  Tue Jun  7 16:12:38 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 7 Jun 2022 16:12:38 GMT
Subject: Integrated: 1467: Update JBS URL in Skara src
In-Reply-To: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>
References: <I6Nz9yF_m7LRTdaSQ6pRyHgGF6Hxu0DB-3XSEjFyg5M=.bb5d2ff0-579d-46a5-a0d2-9d4070d7132e@github.com>
Message-ID: <LIn_WOfK6_qnsT8aNeMMExniUroOTDu6POb_JY3Eg7U=.67118825-2060-42fd-b834-6ff2e2b8ca51@github.com>

On Tue, 7 Jun 2022 14:30:50 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch changes all bugs and github.openjdk.java.net references to openjdk.org.

This pull request has now been integrated.

Changeset: f10879db
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/f10879db0401558e9136564a54d21a663e7f2f19
Stats:     19 lines in 13 files changed: 0 ins; 0 del; 19 mod

1467: Update JBS URL in Skara src

Reviewed-by: gli, darcy

-------------

PR: https://git.openjdk.java.net/skara/pull/1332

From rwestrel at redhat.com  Wed Jun  8 13:01:21 2022
From: rwestrel at redhat.com (Roland Westrelin)
Date: Wed, 08 Jun 2022 15:01:21 +0200
Subject: git pr create command no longer working?
In-Reply-To: <CAPSsVqgDb2WQrFgLeDmwCARH6F=BFeNbg8x8-eGmfsTrb-+LmQ@mail.gmail.com>
References: <87czfk7vv1.fsf@redhat.com>
 <CAPSsVqgDb2WQrFgLeDmwCARH6F=BFeNbg8x8-eGmfsTrb-+LmQ@mail.gmail.com>
Message-ID: <877d5r71i6.fsf@redhat.com>


> The related issue[2] was created.

Thanks!

Roland.


From ehelin at openjdk.java.net  Wed Jun  8 17:33:06 2022
From: ehelin at openjdk.java.net (Erik Helin)
Date: Wed, 8 Jun 2022 17:33:06 GMT
Subject: RFR: 1469: Skara does not build on macOS arm64
Message-ID: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>

Hi all,

please review this patch that adds support for both Linux and macOS AArch64 to `gradlew`. I tested this for macOS/AArch64 but did not have a Linux/AArch64 system available (but it really should work unless I made a typo ??).

Testing:
- [x] Tested locally on macOS/AArch64 using `sh gradlew`
- [x] `sh gradlew test` passes

Thanks,
Erik

-------------

Commit messages:
 - 1469

Changes: https://git.openjdk.java.net/skara/pull/1333/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1333&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1469
  Stats: 17 lines in 2 files changed: 17 ins; 0 del; 0 mod
  Patch: https://git.openjdk.java.net/skara/pull/1333.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/1333/head:pull/1333

PR: https://git.openjdk.java.net/skara/pull/1333

From erikj at openjdk.java.net  Thu Jun  9 08:27:55 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Thu, 9 Jun 2022 08:27:55 GMT
Subject: RFR: 1469: Skara does not build on macOS arm64
In-Reply-To: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>
References: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>
Message-ID: <BLQQ4qIG2TPDs_iu8DyB6WgHm5BVAVH7OUdN94HPxSg=.fa8084aa-6ec2-4503-8f00-910cb99a9562@github.com>

On Wed, 8 Jun 2022 17:29:31 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> 
> please review this patch that adds support for both Linux and macOS AArch64 to `gradlew`. I tested this for macOS/AArch64 but did not have a Linux/AArch64 system available (but it really should work unless I made a typo ??).
> 
> Testing:
> - [x] Tested locally on macOS/AArch64 using `sh gradlew`
> - [x] `sh gradlew test` passes
> 
> Thanks,
> Erik

gradlew line 103:

> 101:             ;;
> 102:     esac
> 103: elif [ "${ARCH}" = "arm64" ]; then

At least on our Linux aarch64 machines, `uname -m` returns `aarch64`.

-------------

PR: https://git.openjdk.java.net/skara/pull/1333

From erikj at openjdk.java.net  Fri Jun 10 10:10:52 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Fri, 10 Jun 2022 10:10:52 GMT
Subject: RFR: 1474: Backout SKARA-1119
Message-ID: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>

This patch is a revert/backout of SKARA-1119.

-------------

Commit messages:
 - Revert "1119: A bot should remind a PR author not to force push"

Changes: https://git.openjdk.org/skara/pull/1334/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1334&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1474
  Stats: 163 lines in 9 files changed: 0 ins; 159 del; 4 mod
  Patch: https://git.openjdk.org/skara/pull/1334.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1334/head:pull/1334

PR: https://git.openjdk.org/skara/pull/1334

From gli at openjdk.java.net  Fri Jun 10 11:20:20 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Fri, 10 Jun 2022 11:20:20 GMT
Subject: RFR: 1474: Backout SKARA-1119
In-Reply-To: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
References: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
Message-ID: <OqwCJ0Kk4U6Yx3AuRx4Nf9aRnsM9etty-p58mXRCmxc=.282435e7-4a6f-4a0b-9954-31667ebe8400@github.com>

On Fri, 10 Jun 2022 10:06:31 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch is a revert/backout of SKARA-1119.

@erikj79 Sorry for the delay. I didn't recieve the email when you commented the [SKARA-1119](https://bugs.openjdk.org/browse/SKARA-1119). It seems because the JBS was upgraded at that day.

> I think this notification encountered a false positive here. I'm pretty sure he just merged in new changed, just as we want people to do: https://github.com/openjdk/jdk/pull/7126#issuecomment-1148319386

The behavior of SKARA in PR-7126 is right. Because the author force-pushed at Jan 20, 2022. Please see https://api.github.com/repos/openjdk/jdk/issues/7126/timeline?page=2 and search `head_ref_force_pushed`.
The historic data will influence the notify bot. But once the historic data is handled, the bot works well.

Could you give more example PRs that the bot gives a force-push notification when merging normally?

-------------

PR: https://git.openjdk.org/skara/pull/1334

From gli at openjdk.java.net  Fri Jun 10 11:29:23 2022
From: gli at openjdk.java.net (Guoxiong Li)
Date: Fri, 10 Jun 2022 11:29:23 GMT
Subject: RFR: 1474: Backout SKARA-1119
In-Reply-To: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
References: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
Message-ID: <FgTETawFsSbjEnrRhKziDknLbWXNno2oYmlkQ0BDjPs=.3a495c62-c1e9-4f39-b7c7-84bef042942a@github.com>

On Fri, 10 Jun 2022 10:06:31 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch is a revert/backout of SKARA-1119.

And I search all the PRs[1] which have the following comment in JDK project . All of them have force-pushed recently or several days ago or several months ago.


Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers? Guide for more information. 


[1] https://github.com/openjdk/jdk/pulls?q=is%3Apr++Please+do+not+rebase+or+force-push+to+an+active+PR+as+it+invalidates+existing+review+comments.+All+changes+will+be+squashed+into+a+single+commit+automatically+when+integrating.+See+OpenJDK+Developers%E2%80%99+Guide+for+more+information.

-------------

PR: https://git.openjdk.org/skara/pull/1334

From erikj at openjdk.java.net  Fri Jun 10 11:44:24 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Fri, 10 Jun 2022 11:44:24 GMT
Subject: RFR: 1474: Backout SKARA-1119
In-Reply-To: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
References: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
Message-ID: <yBEH4HCVOxRt9WhAbAnB6jN3odCh9h1N4ihHXGuhp3E=.f51b2f2e-3ebc-42dd-9265-bf6766cb94a0@github.com>

On Fri, 10 Jun 2022 10:06:31 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch is a revert/backout of SKARA-1119.

It looks like you are right. I was just going by user reports, which I trusted for lack of time of actually investigating more. After getting three independent reports, I just assumed they were right.

-------------

PR: https://git.openjdk.org/skara/pull/1334

From erikj at openjdk.java.net  Fri Jun 10 11:44:24 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Fri, 10 Jun 2022 11:44:24 GMT
Subject: Withdrawn: 1474: Backout SKARA-1119
In-Reply-To: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
References: <TxY8vK7OI7vRJXASMGxbMsCNUqRzY1QYDG9MAKOUsDU=.5fdfbd65-fd9a-433e-811a-1f08055b3895@github.com>
Message-ID: <MenjPc4OWYu--adp-SyPzDXmvf5FnG6FqSIIVnZ_ENI=.0ce64d9c-1431-44f1-af69-c76f38f15ddf@github.com>

On Fri, 10 Jun 2022 10:06:31 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch is a revert/backout of SKARA-1119.

This pull request has been closed without being integrated.

-------------

PR: https://git.openjdk.org/skara/pull/1334

From ehelin at openjdk.java.net  Mon Jun 13 12:24:21 2022
From: ehelin at openjdk.java.net (Erik Helin)
Date: Mon, 13 Jun 2022 12:24:21 GMT
Subject: RFR: 1469: Skara does not build on macOS arm64 [v2]
In-Reply-To: <BLQQ4qIG2TPDs_iu8DyB6WgHm5BVAVH7OUdN94HPxSg=.fa8084aa-6ec2-4503-8f00-910cb99a9562@github.com>
References: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>
 <BLQQ4qIG2TPDs_iu8DyB6WgHm5BVAVH7OUdN94HPxSg=.fa8084aa-6ec2-4503-8f00-910cb99a9562@github.com>
Message-ID: <Al9h-aR-iz6QfafiIO7itkrj-650RK6xePMo2cH8f38=.e03e50d5-c599-4972-b0ef-c5f1cb27f44a@github.com>

On Thu, 9 Jun 2022 08:24:53 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Erik Helin has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Linux uses aarch64
>
> gradlew line 103:
> 
>> 101:             ;;
>> 102:     esac
>> 103: elif [ "${ARCH}" = "arm64" ]; then
> 
> At least on our Linux aarch64 machines, `uname -m` returns `aarch64`.

Thanks for spotting, fixed in latest!

-------------

PR: https://git.openjdk.org/skara/pull/1333

From ehelin at openjdk.java.net  Mon Jun 13 12:24:21 2022
From: ehelin at openjdk.java.net (Erik Helin)
Date: Mon, 13 Jun 2022 12:24:21 GMT
Subject: RFR: 1469: Skara does not build on macOS arm64 [v2]
In-Reply-To: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>
References: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>
Message-ID: <U3iyObAzPS9oM-TG8D7KB16b3f-sc1BE-Wt1nQuSajk=.66311630-9524-46f7-9380-c05405e02156@github.com>

> Hi all,
> 
> please review this patch that adds support for both Linux and macOS AArch64 to `gradlew`. I tested this for macOS/AArch64 but did not have a Linux/AArch64 system available (but it really should work unless I made a typo ??).
> 
> Testing:
> - [x] Tested locally on macOS/AArch64 using `sh gradlew`
> - [x] `sh gradlew test` passes
> 
> Thanks,
> Erik

Erik Helin has updated the pull request incrementally with one additional commit since the last revision:

  Linux uses aarch64

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1333/files
  - new: https://git.openjdk.org/skara/pull/1333/files/7d2da9ef..7ea1c8b0

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1333&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1333&range=00-01

  Stats: 9 lines in 1 file changed: 4 ins; 4 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1333.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1333/head:pull/1333

PR: https://git.openjdk.org/skara/pull/1333

From erikj at openjdk.java.net  Mon Jun 13 12:41:39 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Mon, 13 Jun 2022 12:41:39 GMT
Subject: RFR: 1469: Skara does not build on macOS arm64 [v2]
In-Reply-To: <U3iyObAzPS9oM-TG8D7KB16b3f-sc1BE-Wt1nQuSajk=.66311630-9524-46f7-9380-c05405e02156@github.com>
References: <jI7EXtFVpNcf8Mo_z7eyX4nO8cICdjru6itxFuFccLY=.b6910d84-532a-4bff-81b9-43c1dab8d781@github.com>
 <U3iyObAzPS9oM-TG8D7KB16b3f-sc1BE-Wt1nQuSajk=.66311630-9524-46f7-9380-c05405e02156@github.com>
Message-ID: <SsBeZGwvYAy-FlAorqJTiIxpJwa7vVJbYY5ltqmCPMs=.b0ada350-9d37-4991-bfba-23219c207fbe@github.com>

On Mon, 13 Jun 2022 12:24:21 GMT, Erik Helin <ehelin at openjdk.org> wrote:

>> Hi all,
>> 
>> please review this patch that adds support for both Linux and macOS AArch64 to `gradlew`. I tested this for macOS/AArch64 but did not have a Linux/AArch64 system available (but it really should work unless I made a typo ??).
>> 
>> Testing:
>> - [x] Tested locally on macOS/AArch64 using `sh gradlew`
>> - [x] `sh gradlew test` passes
>> 
>> Thanks,
>> Erik
>
> Erik Helin has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Linux uses aarch64

Marked as reviewed by erikj (Lead).

-------------

PR: https://git.openjdk.org/skara/pull/1333

From erik.joelsson at oracle.com  Mon Jun 13 12:50:56 2022
From: erik.joelsson at oracle.com (erik.joelsson at oracle.com)
Date: Mon, 13 Jun 2022 14:50:56 +0200
Subject: Skara bot outage
Message-ID: <f41d1c1b-e08c-12cc-35d5-9ecacd15fdac@oracle.com>

We are currently experiencing an outage with a subsystem that the Skara 
bots are depending on. Most notably, this is preventing Skara from 
performing most interactions with PRs. We don't currently have an ETA 
for when this will be fixed, but my best guess is sometime during the US 
west coast work day today (Monday).

/Erik


From erikj at openjdk.java.net  Tue Jun 14 11:37:28 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 14 Jun 2022 11:37:28 GMT
Subject: RFR: 1475: Support separate 8u releases identified with an opt
 string
In-Reply-To: <vSsmSPJ2aoSOu72vZfWOSAEZ30EI54fO9q55mV4t17A=.29f6ca1c-154c-433e-a6cb-87be3a985209@github.com>
References: <vSsmSPJ2aoSOu72vZfWOSAEZ30EI54fO9q55mV4t17A=.29f6ca1c-154c-433e-a6cb-87be3a985209@github.com>
Message-ID: <DDRE59JfRcs_PGdQwl-0IWnvJ2az9spz0M1cLiToZI4=.eae9efc2-4ff0-4db2-a20d-2a0a35af437f@github.com>

On Mon, 13 Jun 2022 15:26:00 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch adds a configuration option for the IssueNotifier. This new option controls how tags are matched with fixVersion when updating the Resolved In Build field. Currently, any "opt" string in the fixVersion (e.g. 17.0.4-oracle) is ignored as tags are do not include the 'oracle' opt string. We now have the need to require tags to include such a string for some releases/versions. I believe this should be the default behavior and ignoring "oracle" should be the exception.
> 
> The new option goes into the issue part of the notifier block. By default, the opt string will be considered part of the version string and required in the tag for a match (this is the opposite of the current behavior). By using the new option, a set of opt strings that should not be required in a tag for a match may be configured. In the example below a tag `jdk8u341-b01` would match a fix version of `8u341-foo`.
> 
> 
> "issue": {
>   "tag": {
>     "ignoreopt": [ "foo", "bar" ],
>   }
> }

Pinging to trigger new email.

-------------

PR: https://git.openjdk.org/skara/pull/1335

From erikj at openjdk.java.net  Tue Jun 14 12:37:52 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 14 Jun 2022 12:37:52 GMT
Subject: RFR: 1470: Update to Gradle 7.4.2
In-Reply-To: <VX9rQXWJstc5TEXN_qrij_WBuVRER9hpL1SvzPmW1k4=.734176cd-efa7-4c75-bb66-c6caa97185da@github.com>
References: <VX9rQXWJstc5TEXN_qrij_WBuVRER9hpL1SvzPmW1k4=.734176cd-efa7-4c75-bb66-c6caa97185da@github.com>
Message-ID: <4Dwx0XDSrNGVQid1FzUUD82Jdt0ZVeSdcErCLpwFHMk=.c0683282-dacf-469c-b8cf-08a132dddb96@github.com>

On Mon, 13 Jun 2022 16:35:39 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> 
> please review this patch that updates Gradle to version `7.4.2`.
> 
> Testing:
> - [x] `sh gradlew` passes
> - [x] `sh gradlew test` passes
> 
> Thanks,
> Erik

Marked as reviewed by erikj (Lead).

-------------

PR: https://git.openjdk.org/skara/pull/1336

From ehelin at openjdk.java.net  Tue Jun 14 12:37:52 2022
From: ehelin at openjdk.java.net (Erik Helin)
Date: Tue, 14 Jun 2022 12:37:52 GMT
Subject: Integrated: 1470: Update to Gradle 7.4.2
In-Reply-To: <VX9rQXWJstc5TEXN_qrij_WBuVRER9hpL1SvzPmW1k4=.734176cd-efa7-4c75-bb66-c6caa97185da@github.com>
References: <VX9rQXWJstc5TEXN_qrij_WBuVRER9hpL1SvzPmW1k4=.734176cd-efa7-4c75-bb66-c6caa97185da@github.com>
Message-ID: <Wz28XwwSkWvKVQ285R84VpIN7TcedNDHzsWMjuUqlHk=.51b10e59-468d-47b2-9e94-81c4d11d1431@github.com>

On Mon, 13 Jun 2022 16:35:39 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> Hi all,
> 
> please review this patch that updates Gradle to version `7.4.2`.
> 
> Testing:
> - [x] `sh gradlew` passes
> - [x] `sh gradlew test` passes
> 
> Thanks,
> Erik

This pull request has now been integrated.

Changeset: 2a6f536b
Author:    Erik Helin <ehelin at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/2a6f536bab7f5ae3c7c17d72c7b7c9c93d913ce1
Stats:     2 lines in 1 file changed: 0 ins; 0 del; 2 mod

1470: Update to Gradle 7.4.2

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1336

From erikj at openjdk.java.net  Tue Jun 14 14:08:09 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 14 Jun 2022 14:08:09 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run
Message-ID: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>

In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.

-------------

Commit messages:
 - SKARA-1478

Changes: https://git.openjdk.org/skara/pull/1337/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1337&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1478
  Stats: 59 lines in 1 file changed: 39 ins; 1 del; 19 mod
  Patch: https://git.openjdk.org/skara/pull/1337.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1337/head:pull/1337

PR: https://git.openjdk.org/skara/pull/1337

From erikj at openjdk.java.net  Tue Jun 14 14:12:00 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 14 Jun 2022 14:12:00 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v2]
In-Reply-To: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
Message-ID: <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>

> In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.

Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision:

  Added comment

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1337/files
  - new: https://git.openjdk.org/skara/pull/1337/files/13fdfa62..69e44eb6

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=skara&pr=1337&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=skara&pr=1337&range=00-01

  Stats: 6 lines in 1 file changed: 5 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/skara/pull/1337.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1337/head:pull/1337

PR: https://git.openjdk.org/skara/pull/1337

From ihse at openjdk.java.net  Tue Jun 14 16:37:24 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 14 Jun 2022 16:37:24 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v2]
In-Reply-To: <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
 <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
Message-ID: <Z4qFMlUd71Wc7MxS8pHoL_ivfl3T7Jk710ru8bSYfLM=.cebe8e69-0599-4663-812e-2b70d43a7b2f@github.com>

On Tue, 14 Jun 2022 14:12:00 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.
>
> Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Added comment

bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 223:

> 221:                     "work_id", String.valueOf(workId)))) {
> 222:                 var submittedDuration = Duration.between(createTime, Instant.now());
> 223:                 SUBMITTED_TIME_GAUGE.labels(item.botName(), item.workItemName()).set(submittedDuration.toMillis() / 1_000_000.0);

"to millis" and "divide by a million" looks a bit sus. Can you confirm that you're getting the units right?

-------------

PR: https://git.openjdk.org/skara/pull/1337

From ihse at openjdk.java.net  Tue Jun 14 16:43:16 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 14 Jun 2022 16:43:16 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v2]
In-Reply-To: <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
 <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
Message-ID: <3BadgG0uoyGcmSgbzNwik1Aqas0MBEJj-Jh1J9OTJp4=.3c1c244b-05f0-4ce3-ab43-f5790b955cf0@github.com>

On Tue, 14 Jun 2022 14:12:00 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.
>
> Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Added comment

bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 68:

> 66:      */
> 67:     private static class PendingWorkItem {
> 68:         private final WorkItem item;

Maybe I'm a bit old-fashioned, but I think it looks a bit strange to have private fields but no accesses to them from within the class. (I was actually a bit surprised when I realized an outer class can access private fields in a static nested class...) 

I'm thinking either:
1) create getters
2) declare the fields public, or
3) mabe even consider if this should be a record.

-------------

PR: https://git.openjdk.org/skara/pull/1337

From ihse at openjdk.java.net  Tue Jun 14 16:46:09 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 14 Jun 2022 16:46:09 GMT
Subject: RFR: 1475: Support separate 8u releases identified with an opt
 string
In-Reply-To: <vSsmSPJ2aoSOu72vZfWOSAEZ30EI54fO9q55mV4t17A=.29f6ca1c-154c-433e-a6cb-87be3a985209@github.com>
References: <vSsmSPJ2aoSOu72vZfWOSAEZ30EI54fO9q55mV4t17A=.29f6ca1c-154c-433e-a6cb-87be3a985209@github.com>
Message-ID: <Nn316WK2vVgSCB0TR0C1WyVmYsTIUi5AMYGkpkjhnuY=.83f253a5-b1be-465a-bd38-d5fd697780ac@github.com>

On Mon, 13 Jun 2022 15:26:00 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch adds a configuration option for the IssueNotifier. This new option controls how tags are matched with fixVersion when updating the Resolved In Build field. Currently, any "opt" string in the fixVersion (e.g. 17.0.4-oracle) is ignored as tags are do not include the 'oracle' opt string. We now have the need to require tags to include such a string for some releases/versions. I believe this should be the default behavior and ignoring "oracle" should be the exception.
> 
> The new option goes into the issue part of the notifier block. By default, the opt string will be considered part of the version string and required in the tag for a match (this is the opposite of the current behavior). By using the new option, a set of opt strings that should not be required in a tag for a match may be configured. In the example below a tag `jdk8u341-b01` would match a fix version of `8u341-foo`.
> 
> 
> "issue": {
>   "tag": {
>     "ignoreopt": [ "foo", "bar" ],
>   }
> }

It looks good to me, but my understanding about the entire fixVersion thingie is admittedly a bit hand-wavy. I think it would be good if @kevinrushforth could have a look at it as well.

-------------

Marked as reviewed by ihse (Reviewer).

PR: https://git.openjdk.org/skara/pull/1335

From erikj at openjdk.java.net  Tue Jun 14 17:15:51 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 14 Jun 2022 17:15:51 GMT
Subject: RFR: 1480: Update all openjdk.java.net->openjdk.org
Message-ID: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>

The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.

This patch is a simple search-replace.

-------------

Commit messages:
 - SKARA-1480

Changes: https://git.openjdk.org/skara/pull/1338/files
 Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1338&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1480
  Stats: 435 lines in 54 files changed: 0 ins; 0 del; 435 mod
  Patch: https://git.openjdk.org/skara/pull/1338.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1338/head:pull/1338

PR: https://git.openjdk.org/skara/pull/1338

From erik.joelsson at oracle.com  Tue Jun 14 17:24:47 2022
From: erik.joelsson at oracle.com (erik.joelsson at oracle.com)
Date: Tue, 14 Jun 2022 19:24:47 +0200
Subject: RFR: 1480: Update all openjdk.java.net->openjdk.org
In-Reply-To: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
References: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
Message-ID: <7eb7dca0-346f-c9e3-cb53-c2d47895ed52@oracle.com>

Testing comment through mail.

/Erik

On 6/14/22 19:15, Erik Joelsson wrote:
> The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.
>
> This patch is a simple search-replace.
>
> -------------
>
> Commit messages:
>   - SKARA-1480
>
> Changes: https://git.openjdk.org/skara/pull/1338/files
>   Webrev: https://webrevs.openjdk.java.net/?repo=skara&pr=1338&range=00
>    Issue: https://bugs.openjdk.org/browse/SKARA-1480
>    Stats: 435 lines in 54 files changed: 0 ins; 0 del; 435 mod
>    Patch: https://git.openjdk.org/skara/pull/1338.diff
>    Fetch: git fetch https://git.openjdk.org/skara pull/1338/head:pull/1338
>
> PR: https://git.openjdk.org/skara/pull/1338

From erikj at openjdk.java.net  Tue Jun 14 17:25:31 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Tue, 14 Jun 2022 17:25:31 GMT
Subject: RFR: 1480: Update all openjdk.java.net->openjdk.org
In-Reply-To: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
References: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
Message-ID: <ZQzIVuTyUZe3vSdiNzg-E4sO8T6aNpgv-_l4H6q1y6M=.4154f2af-188d-4e13-88ee-e405a9f367f6@github.com>

On Tue, 14 Jun 2022 17:11:22 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.
> 
> This patch is a simple search-replace.

Test comment.

-------------

PR: https://git.openjdk.org/skara/pull/1338

From duke at openjdk.java.net  Tue Jun 14 17:49:16 2022
From: duke at openjdk.java.net (Raffaello Giulietti)
Date: Tue, 14 Jun 2022 17:49:16 GMT
Subject: RFR: 1480: Update all openjdk.java.net->openjdk.org
In-Reply-To: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
References: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
Message-ID: <JBTmrzjmo8o9uSdTL0RSuJyLcoRjKGzNnqphDotnu0g=.13a64289-9437-43a3-ac8a-5319a5309209@github.com>

On Tue, 14 Jun 2022 17:11:22 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.
> 
> This patch is a simple search-replace.

bots/pr/src/main/java/org/openjdk/skara/bots/pr/LabelCommand.java line 39:

> 37:     private static final Pattern argumentPattern = Pattern.compile("(?:(add|remove)\\s+)((?:[A-Za-z0-9_ at .-]+[\\s,]*)+)");
> 38:     private static final Pattern shortArgumentPattern = Pattern.compile("((?:[-+]?[A-Za-z0-9_ at .-]+[\\s,]*)+)");
> 39:     private static final Pattern ignoredSuffixes = Pattern.compile("^(.*)(?:-dev(?:@openjdk.org)?)$");

The literal dot in `openjdk.org` inside the `Pattern` should probably be escaped
`private static final Pattern ignoredSuffixes = Pattern.compile("^(.*)(?:-dev(?:@openjdk\.org)?)$");`
I didn't check if there are other occurrences, though.

-------------

PR: https://git.openjdk.org/skara/pull/1338

From ihse at openjdk.java.net  Tue Jun 14 18:51:51 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 14 Jun 2022 18:51:51 GMT
Subject: RFR: 1480: Update all openjdk.java.net->openjdk.org
In-Reply-To: <JBTmrzjmo8o9uSdTL0RSuJyLcoRjKGzNnqphDotnu0g=.13a64289-9437-43a3-ac8a-5319a5309209@github.com>
References: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
 <JBTmrzjmo8o9uSdTL0RSuJyLcoRjKGzNnqphDotnu0g=.13a64289-9437-43a3-ac8a-5319a5309209@github.com>
Message-ID: <icAwFcgZcuOQsUFBTYnSOIGEIGHT6LrQH_RieL3Uo6I=.020d1d18-53ca-4d15-b5f2-6f45fd7c3bd0@github.com>

On Tue, 14 Jun 2022 17:44:45 GMT, Raffaello Giulietti <duke at openjdk.org> wrote:

>> The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.
>> 
>> This patch is a simple search-replace.
>
> bots/pr/src/main/java/org/openjdk/skara/bots/pr/LabelCommand.java line 39:
> 
>> 37:     private static final Pattern argumentPattern = Pattern.compile("(?:(add|remove)\\s+)((?:[A-Za-z0-9_ at .-]+[\\s,]*)+)");
>> 38:     private static final Pattern shortArgumentPattern = Pattern.compile("((?:[-+]?[A-Za-z0-9_ at .-]+[\\s,]*)+)");
>> 39:     private static final Pattern ignoredSuffixes = Pattern.compile("^(.*)(?:-dev(?:@openjdk.org)?)$");
> 
> The literal dot in `openjdk.org` inside the `Pattern` should probably be escaped
> `private static final Pattern ignoredSuffixes = Pattern.compile("^(.*)(?:-dev(?:@openjdk\.org)?)$");`
> I didn't check if there are other occurrences, though.

While you are technically correct, this was not done before either. I don't think we should combine a massive, but trivial, search-and-replace PR with additional hands-on-fixes like that.

-------------

PR: https://git.openjdk.org/skara/pull/1338

From ihse at openjdk.java.net  Tue Jun 14 18:57:32 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Tue, 14 Jun 2022 18:57:32 GMT
Subject: RFR: 1480: Update all openjdk.java.net->openjdk.org
In-Reply-To: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
References: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
Message-ID: <6DxKfwFX-wR7-wQCFwnXRwlIPA4oLNI3xrSQQ5ECBA4=.9e0d5ac4-5c30-4994-91f1-a73c2cf8be51@github.com>

On Tue, 14 Jun 2022 17:11:22 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.
> 
> This patch is a simple search-replace.

LGTM

It seems like a lot of redundancy in the code base. Not sure what to do about it, though. We're not likely to change URL once more, so ...

-------------

Marked as reviewed by ihse (Reviewer).

PR: https://git.openjdk.org/skara/pull/1338

From erikj at openjdk.java.net  Wed Jun 15 09:00:06 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Wed, 15 Jun 2022 09:00:06 GMT
Subject: Integrated: 1480: Update all openjdk.java.net->openjdk.org
In-Reply-To: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
References: <EGbJ-XgjWKGs_ruIHZfHCcXYeOkccXVin0tDILg7XG4=.159ce556-5873-420a-b80b-3fca365a4ebb@github.com>
Message-ID: <D6JhQUk7mp7XaXDiUE0TvOS8-xhsW9kdmKUdLnFlnuk=.fcd66b5e-7ae0-4d46-a984-4639cd272c4c@github.com>

On Tue, 14 Jun 2022 17:11:22 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> The Skara source tree contains a lot of references to openjdk.java.net. All of them need to be updated to the new URL openjdk.org. Some of these are essential for core functionality such as jcheck so this is quite urgent.
> 
> This patch is a simple search-replace.

This pull request has now been integrated.

Changeset: 3ff26a61
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/3ff26a61f7f9fdd486e5c2d6260429b19099d0ae
Stats:     435 lines in 54 files changed: 0 ins; 0 del; 435 mod

1480: Update all openjdk.java.net->openjdk.org

Reviewed-by: ihse

-------------

PR: https://git.openjdk.org/skara/pull/1338

From erikj at openjdk.java.net  Wed Jun 15 11:09:53 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Wed, 15 Jun 2022 11:09:53 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v2]
In-Reply-To: <Z4qFMlUd71Wc7MxS8pHoL_ivfl3T7Jk710ru8bSYfLM=.cebe8e69-0599-4663-812e-2b70d43a7b2f@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
 <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
 <Z4qFMlUd71Wc7MxS8pHoL_ivfl3T7Jk710ru8bSYfLM=.cebe8e69-0599-4663-812e-2b70d43a7b2f@github.com>
Message-ID: <wDJ6AHt4HT1k8kDmWKuAiV36Znr4WJVEG86d_hFja6o=.faa873bb-8208-4da9-9901-c513660715d1@github.com>

On Tue, 14 Jun 2022 16:34:24 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

>> Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Added comment
>
> bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 223:
> 
>> 221:                     "work_id", String.valueOf(workId)))) {
>> 222:                 var submittedDuration = Duration.between(createTime, Instant.now());
>> 223:                 SUBMITTED_TIME_GAUGE.labels(item.botName(), item.workItemName()).set(submittedDuration.toMillis() / 1_000_000.0);
> 
> "to millis" and "divide by a million" looks a bit sus. Can you confirm that you're getting the units right?

You are right, that's a mistake.

-------------

PR: https://git.openjdk.org/skara/pull/1337

From erikj at openjdk.java.net  Wed Jun 15 11:15:26 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Wed, 15 Jun 2022 11:15:26 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v2]
In-Reply-To: <3BadgG0uoyGcmSgbzNwik1Aqas0MBEJj-Jh1J9OTJp4=.3c1c244b-05f0-4ce3-ab43-f5790b955cf0@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
 <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
 <3BadgG0uoyGcmSgbzNwik1Aqas0MBEJj-Jh1J9OTJp4=.3c1c244b-05f0-4ce3-ab43-f5790b955cf0@github.com>
Message-ID: <axaGkc3mW3CzHKJKS9DPZh7MzGijqP3B0VX9Cz1y2iY=.badd48ed-686a-4937-8cc3-5e7a1c16a56c@github.com>

On Tue, 14 Jun 2022 16:40:07 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

>> Erik Joelsson has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Added comment
>
> bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 68:
> 
>> 66:      */
>> 67:     private static class PendingWorkItem {
>> 68:         private final WorkItem item;
> 
> Maybe I'm a bit old-fashioned, but I think it looks a bit strange to have private fields but no accesses to them from within the class. (I was actually a bit surprised when I realized an outer class can access private fields in a static nested class...) 
> 
> I'm thinking either:
> 1) create getters
> 2) declare the fields public, or
> 3) mabe even consider if this should be a record.

I actually think this is completely fine. The private fields can only be accessed within this java source file, so there is no risk of messing things up for unknown clients in the future. Adding extra boilerplate seems unnecessary to me. The fields should definitely not be public IMO.

Maybe this would qualify as a record, but I don't think we have started using them in Skara yet. I'm also not sure I want the automatically generated equals and hashcode from a record on this class. It works well with the default Object.hashcode().

-------------

PR: https://git.openjdk.org/skara/pull/1337

From erikj at openjdk.java.net  Wed Jun 15 11:19:02 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Wed, 15 Jun 2022 11:19:02 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v3]
In-Reply-To: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
Message-ID: <IvRB-LiXnmPe1YheumZ7qoOMCw8vJC7z4pMWVcnEuL8=.6a9dde50-5a85-416d-945c-fd309ec674ad@github.com>

> In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.

Erik Joelsson has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains four additional commits since the last revision:

 - Merge branch 'master' into SKARA-1478-pending-metrics
 - Fix divider
 - Added comment
 - SKARA-1478

-------------

Changes:
  - all: https://git.openjdk.org/skara/pull/1337/files
  - new: https://git.openjdk.org/skara/pull/1337/files/69e44eb6..4a012429

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=skara&pr=1337&range=02
 - incr: https://webrevs.openjdk.org/?repo=skara&pr=1337&range=01-02

  Stats: 439 lines in 56 files changed: 0 ins; 0 del; 439 mod
  Patch: https://git.openjdk.org/skara/pull/1337.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1337/head:pull/1337

PR: https://git.openjdk.org/skara/pull/1337

From ihse at openjdk.java.net  Wed Jun 15 14:01:54 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Wed, 15 Jun 2022 14:01:54 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v3]
In-Reply-To: <IvRB-LiXnmPe1YheumZ7qoOMCw8vJC7z4pMWVcnEuL8=.6a9dde50-5a85-416d-945c-fd309ec674ad@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
 <IvRB-LiXnmPe1YheumZ7qoOMCw8vJC7z4pMWVcnEuL8=.6a9dde50-5a85-416d-945c-fd309ec674ad@github.com>
Message-ID: <I8TS_3TKrl9-G13k1k05JZyUJB3BKMosT2a1yu0Ahcs=.668d1a49-6f81-4483-bb4e-8dc827ccb14a@github.com>

On Wed, 15 Jun 2022 11:19:02 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.
>
> Erik Joelsson has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains four additional commits since the last revision:
> 
>  - Merge branch 'master' into SKARA-1478-pending-metrics
>  - Fix divider
>  - Added comment
>  - SKARA-1478

Looks fine.

-------------

Marked as reviewed by ihse (Reviewer).

PR: https://git.openjdk.org/skara/pull/1337

From ihse at openjdk.java.net  Wed Jun 15 14:01:54 2022
From: ihse at openjdk.java.net (Magnus Ihse Bursie)
Date: Wed, 15 Jun 2022 14:01:54 GMT
Subject: RFR: 1478: Add metrics and loggin measuring time before WorkItems
 start to run [v2]
In-Reply-To: <axaGkc3mW3CzHKJKS9DPZh7MzGijqP3B0VX9Cz1y2iY=.badd48ed-686a-4937-8cc3-5e7a1c16a56c@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
 <B7VukdYUSEvNeBeVG_DFszpDwwmAdCPjg4vUXPREj0g=.4945c4fe-5d2a-4baa-8bf1-4e2187722432@github.com>
 <3BadgG0uoyGcmSgbzNwik1Aqas0MBEJj-Jh1J9OTJp4=.3c1c244b-05f0-4ce3-ab43-f5790b955cf0@github.com>
 <axaGkc3mW3CzHKJKS9DPZh7MzGijqP3B0VX9Cz1y2iY=.badd48ed-686a-4937-8cc3-5e7a1c16a56c@github.com>
Message-ID: <d3CcnmzyJFJy295hAtmKycxREAC_HJGzrEafVKLtv58=.fe5f5e0f-cf62-4c38-ad56-7f668e8d1bf9@github.com>

On Wed, 15 Jun 2022 11:12:23 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> bot/src/main/java/org/openjdk/skara/bot/BotRunner.java line 68:
>> 
>>> 66:      */
>>> 67:     private static class PendingWorkItem {
>>> 68:         private final WorkItem item;
>> 
>> Maybe I'm a bit old-fashioned, but I think it looks a bit strange to have private fields but no accesses to them from within the class. (I was actually a bit surprised when I realized an outer class can access private fields in a static nested class...) 
>> 
>> I'm thinking either:
>> 1) create getters
>> 2) declare the fields public, or
>> 3) mabe even consider if this should be a record.
>
> I actually think this is completely fine. The private fields can only be accessed within this java source file, so there is no risk of messing things up for unknown clients in the future. Adding extra boilerplate seems unnecessary to me. The fields should definitely not be public IMO.
> 
> Maybe this would qualify as a record, but I don't think we have started using them in Skara yet. I'm also not sure I want the automatically generated equals and hashcode from a record on this class. It works well with the default Object.hashcode().

Ok.

-------------

PR: https://git.openjdk.org/skara/pull/1337

From erikj at openjdk.java.net  Wed Jun 15 15:35:21 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Wed, 15 Jun 2022 15:35:21 GMT
Subject: Integrated: 1478: Add metrics and loggin measuring time before
 WorkItems start to run
In-Reply-To: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
References: <DD_OoSaZu-KYOD4u7DSNwbxjuEH4SnrfWBApxOD_Jio=.a2a42d08-d9a2-4322-966e-9c5daafed373@github.com>
Message-ID: <wiEFh9GQPvxJqeoNti0Ut9jcyPsnAPBD_fBSVwHypUE=.8121212e-50ba-4979-9b53-751c4274e59f@github.com>

On Tue, 14 Jun 2022 14:03:43 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> In order to investigate and assess performance issues with the Skara bots, I need more data. One key class of data I'm missing is the time it takes from when a WorkItem is created or submitted to when it actually starts to run. This patch adds both metric gauges and log messages that include this information.

This pull request has now been integrated.

Changeset: 11be6dcb
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/11be6dcb6e514a888808a8117766c2bccc64d0bd
Stats:     64 lines in 1 file changed: 44 ins; 1 del; 19 mod

1478: Add metrics and loggin measuring time before WorkItems start to run

Reviewed-by: ihse

-------------

PR: https://git.openjdk.org/skara/pull/1337

From erikj at openjdk.java.net  Wed Jun 15 15:35:42 2022
From: erikj at openjdk.java.net (Erik Joelsson)
Date: Wed, 15 Jun 2022 15:35:42 GMT
Subject: Integrated: 1475: Support separate 8u releases identified with an opt
 string
In-Reply-To: <vSsmSPJ2aoSOu72vZfWOSAEZ30EI54fO9q55mV4t17A=.29f6ca1c-154c-433e-a6cb-87be3a985209@github.com>
References: <vSsmSPJ2aoSOu72vZfWOSAEZ30EI54fO9q55mV4t17A=.29f6ca1c-154c-433e-a6cb-87be3a985209@github.com>
Message-ID: <7R4WS20SDSOACWuBYP3eYnudPANCygWgTzuk6ohDV9U=.c99e3f18-e714-429c-b03b-405e85521fd8@github.com>

On Mon, 13 Jun 2022 15:26:00 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> This patch adds a configuration option for the IssueNotifier. This new option controls how tags are matched with fixVersion when updating the Resolved In Build field. Currently, any "opt" string in the fixVersion (e.g. 17.0.4-oracle) is ignored as tags are do not include the 'oracle' opt string. We now have the need to require tags to include such a string for some releases/versions. I believe this should be the default behavior and ignoring "oracle" should be the exception.
> 
> The new option goes into the issue part of the notifier block. By default, the opt string will be considered part of the version string and required in the tag for a match (this is the opposite of the current behavior). By using the new option, a set of opt strings that should not be required in a tag for a match may be configured. In the example below a tag `jdk8u341-b01` would match a fix version of `8u341-foo`.
> 
> 
> "issue": {
>   "tag": {
>     "ignoreopt": [ "foo", "bar" ],
>   }
> }

This pull request has now been integrated.

Changeset: dc306e35
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/dc306e35670390b733a2c1dfdfeebc3244565078
Stats:     147 lines in 6 files changed: 129 ins; 2 del; 16 mod

1475: Support separate 8u releases identified with an opt string

Reviewed-by: ihse

-------------

PR: https://git.openjdk.org/skara/pull/1335

From erikj at openjdk.org  Thu Jun 16 12:51:47 2022
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 16 Jun 2022 12:51:47 GMT
Subject: RFR: 1482: Add more metrics
Message-ID: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>

In order to better analyze Skara bot performance, I need more metrics. Specifically the skara_runner_*_time gauges are pretty useless in their current form. They would be more useful as counters so we could look at the total execution time for workitems for a specific bot instead of randomly picked single executions of the same.

-------------

Commit messages:
 - Merge branch 'master' into SKARA-1482-metrics
 - Add counter versions of skara_runner gauge metrics

Changes: https://git.openjdk.org/skara/pull/1339/files
 Webrev: https://webrevs.openjdk.org/?repo=skara&pr=1339&range=00
  Issue: https://bugs.openjdk.org/browse/SKARA-1482
  Stats: 12 lines in 1 file changed: 9 ins; 0 del; 3 mod
  Patch: https://git.openjdk.org/skara/pull/1339.diff
  Fetch: git fetch https://git.openjdk.org/skara pull/1339/head:pull/1339

PR: https://git.openjdk.org/skara/pull/1339

From ehelin at openjdk.org  Thu Jun 16 13:20:27 2022
From: ehelin at openjdk.org (Erik Helin)
Date: Thu, 16 Jun 2022 13:20:27 GMT
Subject: RFR: 1482: Add more metrics
In-Reply-To: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>
References: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>
Message-ID: <dGmaYyJpikOs0QX71q1CqiaTgUkf2zUSX5d-6u1Yubs=.8d1a88bc-c863-4d11-a64c-74611067a7e3@github.com>

On Thu, 16 Jun 2022 12:47:34 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> In order to better analyze Skara bot performance, I need more metrics. Specifically the skara_runner_*_time gauges are pretty useless in their current form. They would be more useful as counters so we could look at the total execution time for workitems for a specific bot instead of randomly picked single executions of the same.

Looks good, Reviewed.

I don't really recall why I went with `Gauge` here in the first place, I should probably just have used `Counter` from the beginning. Seeing this patch I would have opted for dropping the gauges, but feel free to them in for a while to see if you need them.

Thanks,
Erik

-------------

Marked as reviewed by ehelin (Reviewer).

PR: https://git.openjdk.org/skara/pull/1339

From erikj at openjdk.org  Thu Jun 16 13:48:20 2022
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 16 Jun 2022 13:48:20 GMT
Subject: RFR: 1482: Add more metrics
In-Reply-To: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>
References: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>
Message-ID: <-9EYm8TQ8T3L_O343w1CiV3_0kHwsZMSlUsT0DiNUy0=.cb7cdc13-751b-45a5-94c1-ac87240b7c99@github.com>

On Thu, 16 Jun 2022 12:47:34 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> In order to better analyze Skara bot performance, I need more metrics. Specifically the skara_runner_*_time gauges are pretty useless in their current form. They would be more useful as counters so we could look at the total execution time for workitems for a specific bot instead of randomly picked single executions of the same.

Thanks. I will likely drop the gauges in the future, but for now, I would rather keep as much information as possible to figure out what is relevant and what isn't from looking at actual data.

-------------

PR: https://git.openjdk.org/skara/pull/1339

From erikj at openjdk.org  Thu Jun 16 13:48:20 2022
From: erikj at openjdk.org (Erik Joelsson)
Date: Thu, 16 Jun 2022 13:48:20 GMT
Subject: Integrated: 1482: Add more metrics
In-Reply-To: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>
References: <Vqb-cmYY2fj380c_iSQsv3SuDisQqlCJhc4X8mHryTk=.bef6687a-f7af-4c16-bf08-35badbb99366@github.com>
Message-ID: <3hygtMbH4vn2fM_cihWy-K4wO6gHnRa951p0L9TekeM=.a1b965d7-83b1-4273-bc12-5773e040302e@github.com>

On Thu, 16 Jun 2022 12:47:34 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> In order to better analyze Skara bot performance, I need more metrics. Specifically the skara_runner_*_time gauges are pretty useless in their current form. They would be more useful as counters so we could look at the total execution time for workitems for a specific bot instead of randomly picked single executions of the same.

This pull request has now been integrated.

Changeset: af100a5f
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/af100a5f86c23d3b75e5f674d3b294d3d6edfa12
Stats:     12 lines in 1 file changed: 9 ins; 0 del; 3 mod

1482: Add more metrics

Reviewed-by: ehelin

-------------

PR: https://git.openjdk.org/skara/pull/1339