-
-
Notifications
You must be signed in to change notification settings - Fork 304
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.
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 TAP pipeline #4285
Merged
Merged
Add TAP pipeline #4285
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,182 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -eo pipefail | ||
|
||
TAPDIR="AQAvitTapFiles" | ||
DOWNLOAD_URL="" | ||
PLATFORM="unknown" | ||
|
||
usage () | ||
{ | ||
echo 'Usage : aqaTap.sh --url <link to download TAP files> --dir <dir to store TAP files>' | ||
} | ||
|
||
parseArgs() { | ||
while [ $# -gt 0 ] && [[ ."$1" = .-* ]] ; do | ||
opt="$1"; | ||
shift; | ||
case "$opt" in | ||
"--url" | "-u" ) | ||
DOWNLOAD_URL="$1"; shift;; | ||
|
||
"--dir" | "-d" ) | ||
TAPDIR="$1"; shift;; | ||
|
||
"--platform" | "-p" ) | ||
PLATFORM="$1"; shift;; | ||
|
||
"--username" ) | ||
USERNAME="$1"; shift;; | ||
|
||
"--password" ) | ||
PASSWORD="$1"; shift;; | ||
|
||
"--clean" | "-c" ) | ||
clean; exit 0;; | ||
|
||
"--deleteGrinder" | "-dg" ) | ||
deleteGrinder; exit 0;; | ||
|
||
"--listAll" | "-l" ) | ||
listAll; exit 0;; | ||
|
||
"--listFailed" | "-lf" ) | ||
listFailed; exit 0;; | ||
|
||
"--listRerun" | "-lr" ) | ||
listRerun; exit 0;; | ||
|
||
"--listTAP" | "-lt" ) | ||
listTAP; exit 0;; | ||
|
||
"--help" | "-h" ) | ||
usage; exit 0;; | ||
|
||
*) echo >&2 "Invalid option: ${opt}"; echo "This option was unrecognized."; usage; exit 1; | ||
esac | ||
done | ||
|
||
echo "TAPDIR: $TAPDIR" | ||
echo "PLATFORM: $PLATFORM" | ||
} | ||
|
||
downloadTAP() { | ||
rm -rf "$PLATFORM" | ||
mkdir "$PLATFORM" | ||
rm -rf tmp | ||
mkdir tmp | ||
cd tmp | ||
if [ "$USERNAME" != "" ] && [ "$PASSWORD" != "" ]; then | ||
curl_options="--user $USERNAME:$PASSWORD" | ||
fi | ||
echo "curl -OLJSks ${curl_options} ${DOWNLOAD_URL}" | ||
curl -OLJSks ${curl_options} "${DOWNLOAD_URL}" | ||
jar_file=$(ls ./*.zip) | ||
jar_file_array=("${jar_file//\\n/ }") | ||
unzip -q "${jar_file_array[0]}" -d . | ||
jar_dirs=$(ls -d ./*/) | ||
jar_dir_array=("${jar_dirs//\\n/ }") | ||
mv "${jar_dir_array[0]}" "$PLATFORM" | ||
mv "$PLATFORM" ../ | ||
cd .. | ||
rm -rf tmp | ||
} | ||
|
||
clean() { | ||
echo "============================" | ||
echo "clean files in $(pwd)" | ||
echo "============================" | ||
echo "List and remove the above *.jck_* ..." | ||
find . -name "*.jck_*" | ||
find . -name "*.jck_*" -exec rm -f {} ';' | ||
|
||
echo "List and remove the above *_special.system_* ..." | ||
find . -name "*_special.system_*" | ||
find . -name "*_special.system_*" -exec rm -f {} ';' | ||
|
||
echo "List and remove the above *.external_* ..." | ||
find . -name "*.external_*" | ||
find . -name "*.external_*" -exec rm -f {} ';' | ||
|
||
echo "List and remove the above *_dev.* ..." | ||
find . -name "*_dev.*" | ||
find . -name "*_dev.*" -exec rm -f {} ';' | ||
|
||
echo "List and remove the above .DS_Store ..." | ||
find . -name ".DS_Store" | ||
find . -name ".DS_Store" -exec rm -f {} ';' | ||
|
||
echo "List and remove the above *_fips* ..." | ||
find . -name "*_fips*" | ||
find . -name "*_fips*" -exec rm -f {} ';' | ||
|
||
echo "Print empty dir ..." | ||
find . -type d -empty -print | ||
echo "Delete empty dir ..." | ||
find . -type d -empty -delete | ||
} | ||
|
||
deleteGrinder() { | ||
echo "============================" | ||
echo "List and remove *Grinder_* ..." | ||
echo "============================" | ||
find . -name "*Grinder_*" | ||
find . -name "*Grinder_*" -exec rm -f {} ';' | ||
} | ||
|
||
listAll() { | ||
echo "============================" | ||
echo "list all files in $(pwd)" | ||
echo "============================" | ||
find . -type f | sort | ||
} | ||
|
||
listFailed() { | ||
echo "============================" | ||
echo "List failed tests in $(pwd)" | ||
echo "============================" | ||
grep -R 'not ok ' . || true | ||
} | ||
|
||
listRerun() { | ||
echo "============================" | ||
echo "list rerun in Grinder..." | ||
echo "============================" | ||
find . -name "*Grinder_*" | xargs grep 'ok ' | ||
} | ||
|
||
listTAP() { | ||
echo "============================" | ||
echo "list AQAvit TAP files in $(pwd)" | ||
echo "============================" | ||
echo "1. List sanity.openjdk ..." | ||
printf '%s\n' *"sanity.openjdk"*.tap | ||
echo "2. List extended.openjdk ..." | ||
printf '%s\n' *"extended.openjdk"*.tap | ||
echo "3. List sanity.functional ..." | ||
printf '%s\n' *"sanity.functional"*.tap | ||
echo "4. List extended.functional ..." | ||
printf '%s\n' *"extended.functional"*.tap | ||
echo "5. List special.functional ..." | ||
printf '%s\n' *"special.functional"*.tap | ||
echo "6. List sanity.system ..." | ||
printf '%s\n' *"sanity.system"*.tap | ||
echo "7. List extended.openjdk ..." | ||
printf '%s\n' *"extended.system"*.tap | ||
echo "8. List sanity.perf ..." | ||
printf '%s\n' *"sanity.perf"*.tap | ||
echo "9. List extended.perf ..." | ||
printf '%s\n' *"extended.perf"*.tap | ||
} | ||
|
||
parseArgs "$@" | ||
mkdir -p "$TAPDIR" | ||
cd "$TAPDIR" | ||
if [ "$DOWNLOAD_URL" ]; then | ||
downloadTAP | ||
fi | ||
cd "$PLATFORM" | ||
listAll | ||
clean | ||
listTAP | ||
listFailed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
#!groovy | ||
|
||
def AQA_REPO = params.AQA_REPO ?: "adoptium" | ||
def AQA_BRANCH = params.AQA_BRANCH ?: "master" | ||
karianna marked this conversation as resolved.
Show resolved
Hide resolved
|
||
def JDK_VERSIONS = params.JDK_VERSIONS.trim().split("\\s*,\\s*"); | ||
def PLATFORMS = params.PLATFORMS.trim().split("\\s*,\\s*"); | ||
def TARGETS = params.TARGETS.trim().split("\\s*,\\s*"); | ||
def LABEL = (params.LABEL) ?: "" | ||
|
||
// Use BUILD_USER_ID if set and jdk-JDK_VERSIONS | ||
def DEFAULT_SUFFIX = (env.BUILD_USER_ID) ? "${env.BUILD_USER_ID} - jdk-${params.JDK_VERSIONS}" : "jdk-${params.JDK_VERSIONS}" | ||
def PIPELINE_DISPLAY_NAME = (params.PIPELINE_DISPLAY_NAME) ? "#${currentBuild.number} - ${params.PIPELINE_DISPLAY_NAME}" : "#${currentBuild.number} - ${DEFAULT_SUFFIX}" | ||
|
||
timestamps{ | ||
// Set the AQA_TEST_PIPELINE Jenkins job displayName | ||
currentBuild.setDisplayName(PIPELINE_DISPLAY_NAME) | ||
node(LABEL) { | ||
TIME_LIMIT = params.TIME_LIMIT ? params.TIME_LIMIT.toInteger() : 1 | ||
timeout(time: TIME_LIMIT, unit: 'HOURS') { | ||
// change openjdk-tests to aqa-tests | ||
sh "curl -Os https://raw.githubusercontent.com/${AQA_REPO}/aqa-tests/${AQA_BRANCH}/buildenv/jenkins/tapVerification/aqaTap.sh" | ||
sh "chmod 755 aqaTap.sh" | ||
karianna marked this conversation as resolved.
Show resolved
Hide resolved
|
||
JDK_VERSIONS.each { JDK_VERSION -> | ||
PLATFORMS.each { PLATFORM -> | ||
String[] tokens = PLATFORM.split('_') | ||
def os = tokens[1]; | ||
def arch = tokens[0]; | ||
if (arch.contains("x86-64")){ | ||
arch = "x64" | ||
} else if (arch.contains("x86-32")) { | ||
arch ="x86-32" | ||
} | ||
|
||
def filter = "*.tar.gz" | ||
if (os.contains("windows")) { | ||
filter = "*.zip" | ||
} | ||
def short_name = "hs" | ||
def jdk_impl = "hotspot" | ||
if (params.VARIANT == "openj9") { | ||
short_name = "j9" | ||
jdk_impl = params.VARIANT | ||
} | ||
def download_url = params.CUSTOMIZED_SDK_URL ? params.CUSTOMIZED_SDK_URL : "" | ||
def sdk_resource_value = SDK_RESOURCE | ||
|
||
if (SDK_RESOURCE == "customized" ) { | ||
if (params.TOP_LEVEL_SDK_URL) { | ||
// example: <jenkins_url>/job/build-scripts/job/openjdk17-pipeline-IBM/354/artifact/target/linux/s390x/openj9/AQAvitTaps/*zip*/AQAvitTaps.zip | ||
|
||
download_url = params.TOP_LEVEL_SDK_URL + "artifact/target/${os}/${arch}/${params.VARIANT}/AQAvitTaps/*zip*/AQAvitTaps.zip" | ||
dir("${WORKSPACE}") { | ||
def aqaTapCmd = "${WORKSPACE}/aqaTap.sh -u ${download_url} -p ${PLATFORM}" | ||
if (params.CUSTOMIZED_SDK_URL_CREDENTIAL_ID) { | ||
// USERNAME and PASSWORD reference with a withCredentials block will not be visible within job output | ||
withCredentials([usernamePassword(credentialsId: "${params.CUSTOMIZED_SDK_URL_CREDENTIAL_ID}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { | ||
sh "$aqaTapCmd" | ||
} | ||
} else { | ||
sh "$aqaTapCmd" | ||
} | ||
|
||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
// archive | ||
sh "tar -cf - ./AQAvitTapFiles | (pigz -9 2>/dev/null || gzip -9) > AQAvitTapFiles.tar.gz" | ||
archiveArtifacts artifacts: "AQAvitTapFiles.tar.gz", fingerprint: true, allowEmptyArchive: false | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has this file been shellchecked?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that a requirement? If so, do we have a doc for instruction?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ran the script at https://www.shellcheck.net/ and updated the script if the suggestion is applicable.