Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add jdk test natives to test-images.tar.gz archive #7733

Merged
merged 1 commit into from
Nov 11, 2019
Merged

Add jdk test natives to test-images.tar.gz archive #7733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions buildenv/jenkins/common/build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,17 +281,17 @@ def build() {
def archive_sdk() {
stage('Archive') {
def buildDir = "build/${RELEASE}/images/"
def testDir = "test/openj9"
def testDir = "test"

dir(OPENJDK_CLONE_DIR) {
sh "tar -C ${buildDir} -zcvf ${SDK_FILENAME} ${JDK_FOLDER}"
// test if the test natives directory is present, only in JDK11+
if (fileExists("${buildDir}${testDir}")) {
if (SPEC.contains('zos')) {
// Note: to preserve the files ACLs set _OS390_USTAR=Y env variable (see variable files)
sh "pax -wvz -s#${buildDir}${testDir}#native-test-libs#g -f ${TEST_FILENAME} ${buildDir}${testDir}"
sh "pax -wvz -s#${buildDir}${testDir}#test-images#g -f ${TEST_FILENAME} ${buildDir}${testDir}"
} else {
sh "tar -C ${buildDir} -zcvf ${TEST_FILENAME} ${testDir} --transform 's,${testDir},native-test-libs,'"
sh "tar -C ${buildDir} -zcvf ${TEST_FILENAME} ${testDir} --transform 's,${testDir},test-images,'"
}
}
if (ARTIFACTORY_SERVER) {
Expand Down
2 changes: 1 addition & 1 deletion buildenv/jenkins/common/variables-functions.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def set_build_variables() {
def set_sdk_variables() {
DATESTAMP = get_date()
SDK_FILENAME = "OpenJ9-JDK${SDK_VERSION}-${SPEC}-${DATESTAMP}.tar.gz"
TEST_FILENAME = "native-test-libs.tar.gz"
TEST_FILENAME = "test-images.tar.gz"
echo "Using SDK_FILENAME = ${SDK_FILENAME}"
echo "Using TEST_FILENAME = ${TEST_FILENAME}"
DIAGNOSTICS_FILENAME = "${JOB_NAME}-${BUILD_NUMBER}-${DATESTAMP}-diagnostics.tar.gz"
Expand Down