Skip to content

Improve the variable name 'customUrl' to 'testDependencyUrl'#6909

Open
Amrutha-Kanhirathingal wants to merge 1 commit intoadoptium:masterfrom
Amrutha-Kanhirathingal:renameCustUrl
Open

Improve the variable name 'customUrl' to 'testDependencyUrl'#6909
Amrutha-Kanhirathingal wants to merge 1 commit intoadoptium:masterfrom
Amrutha-Kanhirathingal:renameCustUrl

Conversation

@Amrutha-Kanhirathingal
Copy link
Contributor

@Amrutha-Kanhirathingal Amrutha-Kanhirathingal commented Feb 24, 2026

Renamed customUrl to testDependencyUrl
Related :#6461
Closes :#6865

@Amrutha-Kanhirathingal Amrutha-Kanhirathingal force-pushed the renameCustUrl branch 3 times, most recently from 2439c41 to 024cfbd Compare February 26, 2026 14:55
@Amrutha-Kanhirathingal Amrutha-Kanhirathingal changed the title improve the variable name 'customUrl' to 'testDependencyUrl' Improve the variable name 'customUrl' to 'testDependencyUrl' Feb 27, 2026
@Amrutha-Kanhirathingal
Copy link
Contributor Author

Hi @annaibm ,@smlambert could you please review the changes?

@Amrutha-Kanhirathingal
Copy link
Contributor Author

@annaibm
Copy link
Contributor

annaibm commented Feb 27, 2026

@Amrutha-Kanhirathingal Could you delete the cached dependency on the test machine and rerun? The test log shows the dependency already existed with the correct hash, so getDependencies.pl skipped the download entirely — the -testDependencyUrl flag was never actually used. We need to verify the flow where the custom URL is used (i.e., when the dependency is missing or the SHA doesn't match), to confirm the renamed flag works end-to-end.

init:
04:34:38      [mkdir] Created dir: /home/jenkins/workspace/Grinder/aqa-tests/TKG/bin
04:34:38  
04:34:38  getDependentLibs:
04:34:41       [exec] --------------------------------------------
04:34:41       [exec] path is set to /home/jenkins/workspace/Grinder/../../externalDependency/system_lib
04:34:41       [exec] task is set to default
04:34:41       [exec] dependencyList is set to json_simple
04:34:41       [exec] System Test jars will be downloaded.
04:34:41       [exec] --------------------------------------------
04:34:41       [exec] Starting download third party dependent jars
04:34:41       [exec] --------------------------------------------
04:34:41       [exec] downloading dependent third party jars to /home/jenkins/workspace/Grinder/../../externalDependency/system_lib
04:34:41       [exec] /home/jenkins/workspace/Grinder/../../externalDependency/system_lib/json-simple.jar exists with correct hash, not downloading
04:34:41       [exec] downloaded dependent third party jars successfully
04:34:41  

@annaibm
Copy link
Contributor

annaibm commented Feb 27, 2026

Also I think we need a companion TKG change as well, I see in TKG
https://github.com/adoptium/TKG/blob/master/scripts/getDependencies.pl#L51 which uses

customUrl = $ENV{'CUSTOM_URL'} if ...;

→ to be $testDependencyUrl = $ENV{'TEST_DEPENDENCY_URL'}
Please do verify other occurrences as well which might be failing when running through our JenkinsfileBase in release jobs..

@Amrutha-Kanhirathingal
Copy link
Contributor Author

Also I think we need a companion TKG change as well, I see in TKG https://github.com/adoptium/TKG/blob/master/scripts/getDependencies.pl#L51 which uses

customUrl = $ENV{'CUSTOM_URL'} if ...;

→ to be $testDependencyUrl = $ENV{'TEST_DEPENDENCY_URL'} Please do verify other occurrences as well which might be failing when running through our JenkinsfileBase in release jobs..

I have already raised a PR for related changes in TKG.Kindly have a look into this.
adoptium/TKG#812

@Amrutha-Kanhirathingal
Copy link
Contributor Author

Amrutha-Kanhirathingal commented Mar 2, 2026

Logs after clearing the dependencies and jars are downloaded using renamed test Dependency Url
Sanity.System https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/58615/console
Sanity.Functional :https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/58612/consoleFull

image

@Amrutha-Kanhirathingal Amrutha-Kanhirathingal marked this pull request as ready for review March 2, 2026 15:25
Renamed customUrl to testDependencyUrl
Related :adoptium#6461
Closes :adoptium/aqa-tests/adoptium#6865
Signed-off-by: Amrutha Kanhirathingal <Amrutha.Kanhirathingal@ibm.com>

Renamed Custom URL to Test Dependency URL
@annaibm
Copy link
Contributor

annaibm commented Mar 9, 2026

Sanity.System https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/58615/console
Sanity.Functional :https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/58612/consoleFull

@Amrutha-Kanhirathingal
Could you run a full test for both sanity.system and non-system (say sanity.functional) I see only one test ran, ensuring that the cached externalDependency directory is removed from the machine before running?

@Amrutha-Kanhirathingal
Copy link
Contributor Author

The test flow will be same for all tests since only the variable was renamed.
All tests are executed after clearing external libraries using Cleanup_Test_Lib Job.
sanity.system : https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/58830/console
Sanity.functional : https://hyc-runtimes-jenkins.swg-devops.com/job/Grinder/58831/

Copy link
Contributor

@annaibm annaibm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants