Migrate Jenkins PR builder to GitHub Action [DI-336] #674

nishaatr · 2024-11-11T10:04:09Z

This came about at the back of removing Code Samples from Platform releases https://hazelcast.atlassian.net/browse/DI-313

TODO (need help here)

Sort out HZ_LICENSEKEY. We have these in GH so not sure which one to use
- HAZELCAST_ENTERPRISE_KEY (may be start with this?)
- HAZELCAST_ENTERPRISE_KEY_V7 (this will future proof perhaps?)
Limit who runs this via the action (checking for org membership) or via the GitHub repo config?
Remove -DskipTests once above is sorted

Fixes: DI-336

JackPGreen · 2024-11-11T10:59:10Z

Sort out HZ_LICENSEKEY. We have these in GH so not sure which one to use

HAZELCAST_ENTERPRISE_KEY (may be start with this?)

HAZELCAST_ENTERPRISE_KEY_V7 (this will future proof perhaps?)

Ideally V7 unless we need backwards compatibility support - https://hazelcast.slack.com/archives/C01JU7ZJYGP/p1719232648844259

Limit who runs this via the action (checking for org membership) or via the GitHub repo config?

Typically (at least on open-source non-hazelcast repos) this is done via GitHub Repo config, but some Hazelcast repos use hazelcast-tpm/membership.

JackPGreen

We also need to log that the Jenkins build should be disabled.

.github/workflows/builder.yaml

Co-authored-by: Jack Green <[email protected]>

nishaatr · 2024-11-11T11:53:55Z

Typically (at least on open-source non-hazelcast repos) this is done via GitHub Repo config, but some Hazelcast repos use hazelcast-tpm/membership.

Fixed 967b2d882eae
Pls check?

JackPGreen · 2024-11-11T11:54:52Z

.github/workflows/builder.yaml

+      - name: Detect untrusted community PR
+        if: ${{ needs.check_for_membership.outputs.check-result == 'false' }}
+        run: |
+          gh pr comment ${{ github.event.number }} \


I'm not actually sure we want a comment here, an annotation the job is probably enough.

(I know you copied it from the PR builder, which does that - but I deliberately used comments there for backwards compatibility reasons)

Not sold either way.

Yes indeed, I copied as made sense to me

an annotation the job is probably enough

What do you mean? Like remove commenting and echo the error?

an annotation the job is probably enough
What do you mean? Like remove commenting and echo the error?

Just echoing the error in a format like this hazelcast/hazelcast-docker#821

.github/workflows/builder.yaml

JackPGreen · 2024-11-11T11:57:17Z

Typically (at least on open-source non-hazelcast repos) this is done via GitHub Repo config, but some Hazelcast repos use hazelcast-tpm/membership.

Fixed 967b2d882eae Pls check?

I've not done it personally so I can't say. Could setup a test repo to try it in to be sure?

Co-authored-by: Jack Green <[email protected]>

nishaatr · 2024-11-11T12:09:47Z

I've not done it personally so I can't say. Could setup a test repo to try it in to be sure?

Agreed. Let me try

nishaatr · 2024-11-11T14:32:20Z

We also need to log that the Jenkins build should be disabled.

Mentioned in JIRA already

nishaatr · 2024-11-11T14:36:15Z

Typically (at least on open-source non-hazelcast repos) this is done via GitHub Repo config, but some Hazelcast repos use hazelcast-tpm/membership.

Fixed 967b2d882eae Pls check?

I've not done it personally so I can't say. Could setup a test repo to try it in to be sure?

Removed external author check completely 95e8cc27c and now relying on GH setting which appears to work as intended

Tested this in test repo (to be deleted)

INTERNAL: https://github.com/hazelcast/test-pr-builder-nish-tmp/pull/6
EXTERNAL: https://github.com/hazelcast/test-pr-builder-nish-tmp/pull/7

nishaatr · 2024-11-11T14:40:51Z

@JackPGreen
The Action build failed but Jenkins passed https://jenkins.hazelcast.com/job/hazelcast-code-samples-pr-builder/706/
Could this be down to NOT passing "-Dhazelcast.enterprise.license.key=$HZ_LICENSEKEY" to MVN or may be something else?

I checked 'HAZELCAST_ENTERPRISE_KEY_V7' is open to all repos so can't be that

JackPGreen · 2024-11-11T14:42:56Z

@JackPGreen The Action build failed but Jenkins passed https://jenkins.hazelcast.com/job/hazelcast-code-samples-pr-builder/706/ Could this be down to NOT passing "-Dhazelcast.enterprise.license.key=$HZ_LICENSEKEY" to MVN or may be something else?

I checked 'HAZELCAST_ENTERPRISE_KEY_V7' is open to all repos so can't be that

Yes, it looks like LicenseUtil has it's own behaviour -

hazelcast-code-samples/helper/src/main/java/com/hazelcast/examples/helper/LicenseUtils.java

Line 39 in 6f418b4

public final class LicenseUtils {

See https://github.com/hazelcast/hazelcast-code-samples/blob/6f418b453ecdb8ff5ec64dce617fe8186deed097/helper/src/main/java/com/hazelcast/examples/helper/LicenseUtils.java#L39

HAZELCAST_ENTERPRISE_KEY_V7 is failing to run tests likely due to incompatibility so trying legacy license

JackPGreen

Approving for further investigation post merge due to pull_request_target.

Follow-up from #674 Add PR author check to block external PRs --------- Co-authored-by: Jack Green <[email protected]>

@ignore

Follow-up from #674 Checkout PR merge branch and not `master` Discovered when trying to disable tests (issue with Azure identity provider in GH). Disabling via Maven POM or \@ignore(...) or removing the module altogether didn't work. Realized it was checking out `master`

Disable test temporarily until [DI-338](https://hazelcast.atlassian.net/browse/DI-338) is fixed We have migrated Code Samples PR builder to GitHub (#674) and Hazelcast is activating Azure identity provider (likely as GH hosted runners run in Azure) which results in the test hanging by continuously attempting to connect to HZ cluster (which likely failed to start)

nishaatr added 3 commits November 8, 2024 16:05

Create builder.yaml

b50075e

Update builder.yaml

5238c7c

Update builder.yaml

0954087

nishaatr changed the title ~~Di 336 migrate jenkins pr builder~~ Migrate Jenkins PR builder to GitHub Action [DI-336] Nov 11, 2024

nishaatr added the enhancement label Nov 11, 2024

nishaatr requested a review from JackPGreen November 11, 2024 10:11

Add HAZELCAST_ENTERPRISE_KEY_V7 license

b0b66bd

JackPGreen reviewed Nov 11, 2024

View reviewed changes

.github/workflows/builder.yaml Outdated Show resolved Hide resolved

.github/workflows/builder.yaml Outdated Show resolved Hide resolved

.github/workflows/builder.yaml Outdated Show resolved Hide resolved

nishaatr and others added 4 commits November 11, 2024 11:44

Add check to fail when PR is authored by non HZ user

967b2d8

Change job name as per PR review

7845599

Co-authored-by: Jack Green <[email protected]>

Remove push to master trigger as redundant

45db5df

Simplify MVN command as per PR review

09f85b2

JackPGreen reviewed Nov 11, 2024

View reviewed changes

nishaatr and others added 2 commits November 11, 2024 12:02

Remove redundant BASH -x

d2712bb

Co-authored-by: Jack Green <[email protected]>

Remove left-over redundant check

680f072

nishaatr added 4 commits November 11, 2024 12:15

Merge branch 'master' into DI-336-migrate-jenkins-pr-builder

f2942f0

Remove duplicate license ENV

f8134d7

Remove PR commenting and instead error our

79c98ab

Removed check for external contributor and rely on GH setting

95e8cc2

nishaatr added 3 commits November 11, 2024 14:54

Code Samples requires passing of HZ license

64e068c

See https://github.com/hazelcast/hazelcast-code-samples/blob/6f418b453ecdb8ff5ec64dce617fe8186deed097/helper/src/main/java/com/hazelcast/examples/helper/LicenseUtils.java#L39

Use legacy HAZELCAST_ENTERPRISE_KEY

9a8e3fd

HAZELCAST_ENTERPRISE_KEY_V7 is failing to run tests likely due to incompatibility so trying legacy license

Set HZ license via ENV

f92a4d1

nishaatr added 2 commits November 11, 2024 16:34

Use env. to get value

0b627ef

Update PR trigger and use secret directly

04e9f5b

JackPGreen approved these changes Nov 11, 2024

View reviewed changes

nishaatr merged commit 9f5ca42 into hazelcast:master Nov 11, 2024

JackPGreen mentioned this pull request Nov 11, 2024

PR Builder Test #675

Closed

nishaatr mentioned this pull request Nov 12, 2024

Add PR membership check [DI-336] #679

Merged

nishaatr added a commit that referenced this pull request Nov 12, 2024

Add PR membership check [DI-336] (#679)

b865852

Follow-up from #674 Add PR author check to block external PRs --------- Co-authored-by: Jack Green <[email protected]>

nishaatr mentioned this pull request Nov 13, 2024

Checkout PR merge branch and not master [DI-336] #683

Merged

nishaatr mentioned this pull request Nov 13, 2024

Disable SpringHibernate2lcApplicationTest [DI-336] #685

Merged

Migrate Jenkins PR builder to GitHub Action [DI-336] #674

Migrate Jenkins PR builder to GitHub Action [DI-336] #674

Uh oh!

Conversation

nishaatr commented Nov 11, 2024 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JackPGreen commented Nov 11, 2024

Uh oh!

JackPGreen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nishaatr commented Nov 11, 2024

Uh oh!

JackPGreen Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

nishaatr Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

JackPGreen Nov 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JackPGreen commented Nov 11, 2024

Uh oh!

nishaatr commented Nov 11, 2024

Uh oh!

nishaatr commented Nov 11, 2024

Uh oh!

nishaatr commented Nov 11, 2024

Uh oh!

nishaatr commented Nov 11, 2024

Uh oh!

JackPGreen commented Nov 11, 2024

Uh oh!

JackPGreen left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

nishaatr commented Nov 11, 2024 •

edited by atlassian bot

Loading

JackPGreen Nov 11, 2024 •

edited

Loading