Setting CUSTOMIZED_SDK_URL and SDK_RESOURCE as non-customized ignores the SDK_RESOURCE value #2097

sophia-guo · 2020-12-08T16:14:59Z

In the grinder setting it says Customized SDK URL, only set when SDK_RESOURCE customized. However if the user accidentally set both CUSTOMIZED_SDK_URL and SDK_RESOURCE ( non-customized) the system will take CUSTOMIZED_SDK_URL and ignore the SDK_RESOURCE's setting.

Senario:

First use CUSTOMIZED_SDK_URL
Rerun use SDK_RESOURCE = nightly to compare the difference ( CUSTOMIZED_SDK_URL is not reset as empty)
Build will rerun with CUSTOMIZED_SDK_URL, which ignores SDK_RESOURCE as nightly ( also in get.sh, SDK_RESOURCE default is nightly).

Solution:
Enhance the check condition(https://github.com/adoptium/aqa-tests/blob/master/get.sh#L180) withif "$SDK_RESOURCE" == "customized" in two places.

example：
https://ci.adoptopenjdk.net/view/work-in-progress/job/grinder_sandbox/162/console

The text was updated successfully, but these errors were encountered:

abigailsleek · 2021-10-12T20:39:48Z

I would like to work on this issue.

abigailsleek · 2021-10-15T14:53:18Z

A follow-up question for this issue. Please, I just to confirm that I understand what I am to do. I am to update this line https://github.com/adoptium/aqa-tests/blob/master/get.sh#L180 with
if "$SDK_RESOURCE" == "customized"
then this latestBuildUrl="${CUSTOMIZED_SDK_URL}${max}/" will follow.
While for https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L371-L373 I just update with the if "$SDK_RESOURCE" == "customized" statement only. Yes?

sophia-guo · 2021-10-15T20:41:44Z

The logic is a little bit different as now we also allow users to provide a base artifactory URL (URL before the build number). For this issue we can update jenkinsfileBase only. No need to update get.sh anymore.

For jenkinsfileBase the Line360-L365 https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L360-L365 should be updated.

Customized SDK URL only set when SDK_RESOURCE is customized. That is as long as SDK_RESOURCE != "customized" ( except (params.SDK_RESOURCE == 'nightly' && params.CUSTOMIZED_SDK_URL)) we'd like to set CUSTOMIZED_SDK_URL_OPTION = "".

if (params.SDK_RESOURCE == 'nightly' && params.CUSTOMIZED_SDK_URL) {
	CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'"
} else if (params.SDK_RESOURCE != 'customized') {
	CUSTOMIZED_SDK_URL_OPTION = ""
} else if (params.CUSTOMIZED_SDK_URL) {
	CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'"
} else {
         error("For customized sdk resource, please provide the sdk url as CUSTOMIZED_SDK_URL")
}

And then the check for !params.CUSTOMIZED_SDK_URL in https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L373 can also be removed.

abigailsleek · 2021-10-16T08:20:42Z

Thank you for the clarification.

On Fri, 15 Oct 2021 at 9:41 PM, sophia-guo ***@***.***> wrote: The logic is a little bit different as now we also allow users to provide a base artifactory URL (URL before the build number). For this issue we can update jenkinsfileBase only. No need to update get.sh anymore. For jenkinsfileBase the Line360-L365 https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L360-L365 should be updated. Customized SDK URL only set when SDK_RESOURCE is customized. That is as long as SDK_RESOURCE != "customized" ( except (params.SDK_RESOURCE == 'nightly' && params.CUSTOMIZED_SDK_URL)) we'd like to set CUSTOMIZED_SDK_URL_OPTION = "". if (params.SDK_RESOURCE == 'nightly' && params.CUSTOMIZED_SDK_URL) { CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'" } else if (params.SDK_RESOURCE != 'customized') { CUSTOMIZED_SDK_URL_OPTION = "" } else if (params.CUSTOMIZED_SDK_URL) { CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'" } else { error("For customized sdk resource, please provide the sdk url as CUSTOMIZED_SDK_URL") } And then the check for !params.CUSTOMIZED_SDK_URL in https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L373 can also be removed. — You are receiving this because you were assigned. Reply to this email directly, view it on GitHub <#2097 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AHMKITNLKGBD5BPIFAS4AOTUHCGZHANCNFSM4USF7ACA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- Nneamaka Chalokwu

abigailsleek · 2021-10-16T21:40:03Z

Hello Sophia, Please kindly review my pull request on this issue, and share with me your feedback. Thank you. On Sat, 16 Oct 2021 at 9:20 AM, Nneamaka Chalokwu ***@***.***> wrote:

Thank you for the clarification. On Fri, 15 Oct 2021 at 9:41 PM, sophia-guo ***@***.***> wrote: > The logic is a little bit different as now we also allow users to provide > a base artifactory URL (URL before the build number). For this issue we can > update jenkinsfileBase only. No need to update get.sh anymore. > > For jenkinsfileBase the Line360-L365 > https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L360-L365 > should be updated. > > Customized SDK URL only set when SDK_RESOURCE is customized. That is as > long as SDK_RESOURCE != "customized" ( except (params.SDK_RESOURCE == > 'nightly' && params.CUSTOMIZED_SDK_URL)) we'd like to set CUSTOMIZED_SDK_URL_OPTION > = "". > > if (params.SDK_RESOURCE == 'nightly' && params.CUSTOMIZED_SDK_URL) { > CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'" > } else if (params.SDK_RESOURCE != 'customized') { > CUSTOMIZED_SDK_URL_OPTION = "" > } else if (params.CUSTOMIZED_SDK_URL) { > CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'" > } else { > error("For customized sdk resource, please provide the sdk url as CUSTOMIZED_SDK_URL") > } > > And then the check for !params.CUSTOMIZED_SDK_URL in > https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L373 > can also be removed. > > — > You are receiving this because you were assigned. > Reply to this email directly, view it on GitHub > <#2097 (comment)>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AHMKITNLKGBD5BPIFAS4AOTUHCGZHANCNFSM4USF7ACA> > . > Triage notifications on the go with GitHub Mobile for iOS > <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> > or Android > <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. > > -- Nneamaka Chalokwu

-- Nneamaka Chalokwu

llxia · 2021-10-18T13:09:44Z

Please note that our scenario has changed. We also have the following case where:
SDK_RESOURCE=nightly
CUSTOMIZED_SDK_URL=<base URL from artifactory>
In this case, our script will try to find the latest URL link.

abigailsleek · 2021-10-18T13:12:23Z

Okay, thank you. Does this mean the code needs to be updated? If so, where exactly.

On Mon, 18 Oct 2021 at 2:09 PM, Lan Xia ***@***.***> wrote: Please note that our scenario has changed. We also have the following case where: SDK_RESOURCE=nightly CUSTOMIZED_SDK_URL=<base URL from artifactory> In this case, our script will try to find the latest URL link. — You are receiving this because you were assigned. Reply to this email directly, view it on GitHub <#2097 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AHMKITKSEEVBTHA2TEVW3RDUHQMCFANCNFSM4USF7ACA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- Nneamaka Chalokwu

sophia-guo · 2021-10-18T14:37:12Z

yes, the changes or suggestion in #2097 (comment) has included the scenario SDK_RESOURCE=nightly CUSTOMIZED_SDK_URL=<base URL from artifactory>

@abigailsleek I didn't find your changes, did you create a PR?

abigailsleek · 2021-10-18T15:38:13Z

Okay, thank you. Yes I already created a pull request for this repository because I made changes to the testJobTemplate file. I’ll share the link to my commit on this issue so you can review it. 3af6c7e

On Mon, 18 Oct 2021 at 3:37 PM, sophia-guo ***@***.***> wrote: yes, the changes or suggestion in #2097 (comment) <#2097 (comment)> has included the scenario SDK_RESOURCE=nightly CUSTOMIZED_SDK_URL=<base URL from artifactory> @abigailsleek <https://github.com/abigailsleek> I didn't find your changes, did you create a PR? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2097 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AHMKITI76ON23BXJGAWH3S3UHQWKFANCNFSM4USF7ACA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- Nneamaka Chalokwu

llxia · 2021-10-18T15:49:15Z

Thanks @abigailsleek . Could you please create one PR per issue?

abigailsleek · 2021-10-18T20:41:56Z

Sure, I will do that.

On Mon, 18 Oct 2021 at 4:49 PM, Lan Xia ***@***.***> wrote: Thanks @abigailsleek <https://github.com/abigailsleek> . Could you please create one PR per issue? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2097 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AHMKITOBIGUY4VGUNC47VVLUHQ6YNANCNFSM4USF7ACA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- Nneamaka Chalokwu

abigailsleek · 2021-10-23T14:55:59Z

Hi, I tried creating another PR but it didn't work because it’s on the same branch. Should I create another branch or I should pull request on one of the other branches?

On Mon, 18 Oct 2021 at 4:49 PM, Lan Xia ***@***.***> wrote: Thanks @abigailsleek <https://github.com/abigailsleek> . Could you please create one PR per issue? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2097 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AHMKITOBIGUY4VGUNC47VVLUHQ6YNANCNFSM4USF7ACA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- Nneamaka Chalokwu

smlambert · 2021-10-23T15:25:23Z

I typically use 1 branch per issue (where each issue gets is separate PR to resolve it). That way, I can start each branch freshly synched with the main branch and it contains no other clutter or content from other PRs. (see 3 minute recording describing this practice for guidance).

abigailsleek · 2021-10-23T16:50:41Z

Thank you for this information.

On Sat, 23 Oct 2021 at 4:25 PM, Shelley Lambert ***@***.***> wrote: I typically use 1 branch per issue (where each issue gets is separate PR to resolve it). That way, I can start each branch freshly synched with the main branch and it contains no other clutter. (see 3 minute recording <https://drive.google.com/file/d/1yTcXaA8vHgHMkkuDONKeDCEufgZJO-TJ/view?usp=sharing> describing this practice for guidance). — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2097 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AHMKITPPEDHU5SDNWTTIUE3UILHW3ANCNFSM4USF7ACA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

-- Nneamaka Chalokwu

abigailsleek · 2021-10-26T12:22:42Z

Hi Sophia, here is the link to my pull request. Kindly review. Thank you. #3099 On Sat, 23 Oct 2021 at 5:50 PM, Nneamaka Chalokwu ***@***.***> wrote:

Thank you for this information. On Sat, 23 Oct 2021 at 4:25 PM, Shelley Lambert ***@***.***> wrote: > I typically use 1 branch per issue (where each issue gets is separate PR > to resolve it). That way, I can start each branch freshly synched with the > main branch and it contains no other clutter. (see 3 minute recording > <https://drive.google.com/file/d/1yTcXaA8vHgHMkkuDONKeDCEufgZJO-TJ/view?usp=sharing> > describing this practice for guidance). > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <#2097 (comment)>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AHMKITPPEDHU5SDNWTTIUE3UILHW3ANCNFSM4USF7ACA> > . > Triage notifications on the go with GitHub Mobile for iOS > <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> > or Android > <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. > > -- Nneamaka Chalokwu

-- Nneamaka Chalokwu

YeeSkywalker · 2022-01-21T20:03:46Z

Hi there, I am wondering if I could take this one? It would be much appreciated!

Checkout: Yee Lin Date: Jan 21st, 2022 Relate issue: (adoptium#2097) adoptium#2097

llxia · 2022-09-14T14:17:52Z

Yes, it is a good first issue.

julian55455 · 2022-10-13T07:37:59Z

@zdtsw Can I take up this as we wait for feedback on this issue

zdtsw · 2022-10-13T07:42:40Z

@smlambert can you assign it to @julian55455 ?

sophia-guo · 2022-10-13T14:55:05Z

@llxia Has the mismatch been done #2097 (comment) ?

llxia · 2022-10-13T15:25:16Z

No, it is a good first issue.

sophia-guo · 2022-10-13T16:43:22Z

@llxia , it's a good first issue under https://github.com/ibmruntimes/ci-jenkins-pipelines? Seems I can't even have the permission to see issues. Is it open to all people or only to ibmers?

llxia · 2022-10-13T17:01:12Z

I do not see the issue tap in that repo as well. Maybe we can open the issue in aqa-tests instead.

Tishly · 2022-10-16T18:40:01Z

Hi @llxia, Is this issue still open? I would like to work on it.

zdtsw · 2022-10-17T05:27:46Z

Hi @llxia, Is this issue still open? I would like to work on it.

I think @julian55455 is on it already? I do not have permission on this repo to assign her, maybe @smlambert or @llxia can help

llxia · 2022-10-17T13:07:34Z

@julian55455 I assigned this issue to you. Thanks

Ndacyayisenga-droid · 2023-05-11T00:39:23Z

@smlambert should this issue still be open?

sophia-guo added enhancement good first issue labels Jun 25, 2021

sophia-guo assigned abigailsleek Oct 12, 2021

smlambert mentioned this issue Oct 29, 2021

Setting CUSTOMIZED_SDK_URL and SDK_RESOURCES as non customized ignores the SDK_RESOURCE value #3099

Closed

smlambert unassigned abigailsleek Dec 9, 2021

smlambert assigned YeeSkywalker Jan 21, 2022

YeeSkywalker added a commit to YeeSkywalker/aqa-tests that referenced this issue Jan 21, 2022

Update jenkinsfileBase to enchance check condition for CUTOMIZED_SDK_URL

6fe4ae8

Checkout: Yee Lin Date: Jan 21st, 2022 Relate issue: (adoptium#2097) adoptium#2097

smlambert unassigned YeeSkywalker Sep 28, 2022

smlambert removed this from Adoptium September 2022 Plan Sep 28, 2022

smlambert added this to Adoptium October 2022 Plan Sep 28, 2022

smlambert added this to Outreachy December 2022 Oct 9, 2022

smlambert removed the canosp label Oct 9, 2022

llxia assigned julian55455 Oct 17, 2022

smlambert removed this from Outreachy December 2022 Jan 11, 2023

smlambert removed this from Adoptium October 2022 Plan Jan 11, 2023

smlambert unassigned julian55455 Jan 31, 2024

smlambert added this to 2024 1Q Adoptium Plan Jan 31, 2024

smlambert moved this to Todo in 2024 1Q Adoptium Plan Jan 31, 2024

sophia-guo removed the good first issue label Jan 31, 2024

sophia-guo mentioned this issue Feb 2, 2024

Unset CUSTOMIZED_SDK_URL if SDK_RESOURCE is not customized #5034

Merged

sophia-guo self-assigned this Feb 2, 2024

llxia closed this as completed in #5034 Feb 8, 2024

github-project-automation bot moved this from Todo to Done in 2024 1Q Adoptium Plan Feb 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Setting CUSTOMIZED_SDK_URL and SDK_RESOURCE as non-customized ignores the SDK_RESOURCE value #2097

Setting CUSTOMIZED_SDK_URL and SDK_RESOURCE as non-customized ignores the SDK_RESOURCE value #2097

sophia-guo commented Dec 8, 2020 •

edited

Loading

abigailsleek commented Oct 12, 2021

abigailsleek commented Oct 15, 2021

sophia-guo commented Oct 15, 2021

abigailsleek commented Oct 16, 2021 via email

abigailsleek commented Oct 16, 2021 via email

llxia commented Oct 18, 2021

abigailsleek commented Oct 18, 2021 via email

sophia-guo commented Oct 18, 2021

abigailsleek commented Oct 18, 2021 via email

llxia commented Oct 18, 2021

abigailsleek commented Oct 18, 2021 via email

abigailsleek commented Oct 23, 2021 via email

smlambert commented Oct 23, 2021 •

edited

Loading

abigailsleek commented Oct 23, 2021 via email

abigailsleek commented Oct 26, 2021 via email

YeeSkywalker commented Jan 21, 2022

llxia commented Sep 14, 2022

julian55455 commented Oct 13, 2022 •

edited

Loading

zdtsw commented Oct 13, 2022

sophia-guo commented Oct 13, 2022

llxia commented Oct 13, 2022

sophia-guo commented Oct 13, 2022

llxia commented Oct 13, 2022

Tishly commented Oct 16, 2022

zdtsw commented Oct 17, 2022

llxia commented Oct 17, 2022

Ndacyayisenga-droid commented May 11, 2023

Setting CUSTOMIZED_SDK_URL and SDK_RESOURCE as non-customized ignores the SDK_RESOURCE value #2097

Setting CUSTOMIZED_SDK_URL and SDK_RESOURCE as non-customized ignores the SDK_RESOURCE value #2097

Comments

sophia-guo commented Dec 8, 2020 • edited Loading

abigailsleek commented Oct 12, 2021

abigailsleek commented Oct 15, 2021

sophia-guo commented Oct 15, 2021

abigailsleek commented Oct 16, 2021 via email

abigailsleek commented Oct 16, 2021 via email

llxia commented Oct 18, 2021

abigailsleek commented Oct 18, 2021 via email

sophia-guo commented Oct 18, 2021

abigailsleek commented Oct 18, 2021 via email

llxia commented Oct 18, 2021

abigailsleek commented Oct 18, 2021 via email

abigailsleek commented Oct 23, 2021 via email

smlambert commented Oct 23, 2021 • edited Loading

abigailsleek commented Oct 23, 2021 via email

abigailsleek commented Oct 26, 2021 via email

YeeSkywalker commented Jan 21, 2022

llxia commented Sep 14, 2022

julian55455 commented Oct 13, 2022 • edited Loading

zdtsw commented Oct 13, 2022

sophia-guo commented Oct 13, 2022

llxia commented Oct 13, 2022

sophia-guo commented Oct 13, 2022

llxia commented Oct 13, 2022

Tishly commented Oct 16, 2022

zdtsw commented Oct 17, 2022

llxia commented Oct 17, 2022

Ndacyayisenga-droid commented May 11, 2023

sophia-guo commented Dec 8, 2020 •

edited

Loading

smlambert commented Oct 23, 2021 •

edited

Loading

julian55455 commented Oct 13, 2022 •

edited

Loading