Skip to content

Conversation

@Amrutha-Kanhirathingal
Copy link
Contributor

Added script to clean up test lib directory (externalDependencyDir/testDependencyDir)

node {
def repo = params.ADOPTOPENJDK_REPO
def branch = params.ADOPTOPENJDK_BRANCH
def dependencyDir = params.DEPENDENCY_DIR ? params.DEPENDENCY_DIR : 'externalDependency'
Copy link
Contributor

Choose a reason for hiding this comment

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

def dependencyDir = params.DEPENDENCY_DIR ?: 'externalDependency'

}

def platformMap = [
'amac' : '(ci.role.test||ci.role.test.fips)&&hw.arch.aarch64&&(sw.os.osx||sw.os.mac)',
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you fix the indentation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure

@@ -0,0 +1,60 @@
node {
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we use node in the original script?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No lan

Copy link
Contributor

Choose a reason for hiding this comment

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

If the node is not required, then we should not add it.

@llxia
Copy link
Contributor

llxia commented Aug 8, 2025

This is the initial check-in for the script from the job config to git repo.

@llxia
Copy link
Contributor

llxia commented Aug 8, 2025

@Amrutha-Kanhirathingal please add related: runtimes/automation/issues/166 in the git commit.

@karianna karianna requested a review from llxia August 11, 2025 21:50
@Amrutha-Kanhirathingal Amrutha-Kanhirathingal force-pushed the cleanupExternalTestlib branch 2 times, most recently from bded437 to d5cbc9e Compare August 13, 2025 14:32
Comment on lines 4 to 11
'amac' : '(ci.role.test||ci.role.test.fips)&&hw.arch.aarch64&&(sw.os.osx||sw.os.mac)',
'xmac' : '(ci.role.test||ci.role.test.fips)&&hw.arch.x86&&sw.os.mac',
'xlinux' : '(ci.role.test||ci.role.test.fips)&&hw.arch.x86&&sw.os.linux',
'plinux' : '(ci.role.test||ci.role.test.fips)&&hw.arch.ppc64le&&sw.os.linux',
'zlinux' : '(ci.role.test||ci.role.test.fips)&&hw.arch.s390x&&sw.os.linux',
'alinux' : '(ci.role.test||ci.role.test.fips)&&hw.arch.aarch64&&sw.os.linux',
'win' : '(ci.role.test||ci.role.test.fips)&&hw.arch.x86&&sw.os.windows',
'aix' : '(ci.role.test||ci.role.test.fips)&&hw.arch.ppc64&&sw.os.aix'
Copy link
Contributor

Choose a reason for hiding this comment

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

We should have indentation.

related: runtimes/automation/issues/166
Signed-off-by:Amrutha Kanhirathingal <Amrutha.Kanhirathingal@ibm.com>
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

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

LGTM

@llxia llxia requested a review from LongyuZhang August 13, 2025 20:29
Copy link
Contributor

@LongyuZhang LongyuZhang left a comment

Choose a reason for hiding this comment

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

LGTM

@LongyuZhang LongyuZhang merged commit 00b3e89 into adoptium:master Aug 13, 2025
2 checks passed
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