Skip to content

Add test coverage xml and support 1.x gradle check #2279

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

Merged
peterzhuamazon merged 2 commits into from
Jun 29, 2022
Merged

Add test coverage xml and support 1.x gradle check #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6dcafa
Add test coverage xml and support 1.x gradle check
peterzhuamazon Jun 28, 2022
afb89db
Remove comments
peterzhuamazon Jun 29, 2022
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
4 changes: 2 additions & 2 deletions jenkins/gradle/gradle-check.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ pipeline {
JAVA11_HOME="/var/jenkins/tools/hudson.model.JDK/jdk-11"
JAVA17_HOME="/var/jenkins/tools/hudson.model.JDK/jdk-17"
JAVA8_HOME="/var/jenkins/tools/hudson.model.JDK/jdk-8"
JAVA_HOME="/var/jenkins/tools/hudson.model.JDK/jdk-17"
USER_BUILD_CAUSE = currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause')
TIMER_BUILD_CAUSE = currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause')
}
Expand Down Expand Up @@ -89,7 +88,7 @@ pipeline {
stage('Run Gradle Check') {
steps {
script {
sh("ls /var/jenkins/tools/hudson.model.JDK/ && env | grep JAVA")
sh("ls /var/jenkins/tools/hudson.model.JDK/")
if (env.USER_BUILD_CAUSE.equals('[]') && env.TIMER_BUILD_CAUSE.equals('[]')) {
def pr_url = "${pr_to_clone_url}".replace(".git", "/pull/${pr_number}")
println("Triggered by PR: ${pr_url}")
Expand All @@ -114,6 +113,7 @@ pipeline {
}
post() {
always {
archiveArtifacts artifacts: 'search/build/reports/jacoco/**/*.xml', onlyIfSuccessful: true
script {
sh("rm -rf *")
postCleanup()
Expand Down
23 changes: 21 additions & 2 deletions tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,28 @@
set -e
set +x

env | grep JAVA | grep HOME

echo "Git clone: https://github.com/opensearch-project/OpenSearch with ref: main"
rm -rf search
git clone https://github.com/opensearch-project/OpenSearch search
cd search/
git checkout -f main
git rev-parse HEAD

echo "Get Major Version"
OS_VERSION=`cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
OS_MAJOR_VERSION=`echo $OS_VERSION | grep -oE '[0-9]+' | head -n 1`
echo "Version: $OS_VERSION, Major Version: $OS_MAJOR_VERSION"

if [ "$OS_MAJOR_VERSION" -lt 2 ]; then
echo "Using JAVA 11"
export JAVA_HOME=$JAVA11_HOME
else
echo "Using JAVA 17"
export JAVA_HOME=$JAVA17_HOME
fi

env | grep JAVA | grep HOME

echo "Stop existing gradledaemon"
./gradlew --stop
find ~/.gradle -type f -name "*.lock" -delete
Expand All @@ -37,6 +50,12 @@
echo "Check docker-compose version"
docker-compose version

echo "Check existing processes"
ps -ef | grep [o]pensearch | wc -l
echo "Cleanup existing processes"
kill -9 `ps -ef | grep [o]pensearch | awk '{print $2}'` > /dev/null 2>&1 || echo
ps -ef | grep [o]pensearch | wc -l

echo "Start gradlecheck"
GRADLE_CHECK_STATUS=0
./gradlew check -Dtests.coverage=true --no-daemon --no-scan || GRADLE_CHECK_STATUS=1
Expand Down
23 changes: 21 additions & 2 deletions vars/runGradleCheck.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,28 @@ void call(Map args = [:]) {
set -e
set +x

env | grep JAVA | grep HOME

echo "Git clone: ${git_repo_url} with ref: ${git_reference}"
rm -rf search
git clone ${git_repo_url} search
cd search/
git checkout -f ${git_reference}
git rev-parse HEAD

echo "Get Major Version"
OS_VERSION=`cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+'`
OS_MAJOR_VERSION=`echo \$OS_VERSION | grep -oE '[0-9]+' | head -n 1`
echo "Version: \$OS_VERSION, Major Version: \$OS_MAJOR_VERSION"

if [ "\$OS_MAJOR_VERSION" -lt 2 ]; then
echo "Using JAVA 11"
export JAVA_HOME=\$JAVA11_HOME
else
echo "Using JAVA 17"
export JAVA_HOME=\$JAVA17_HOME
fi

env | grep JAVA | grep HOME

echo "Stop existing gradledaemon"
./gradlew --stop
find ~/.gradle -type f -name "*.lock" -delete
Expand All @@ -43,6 +56,12 @@ void call(Map args = [:]) {
echo "Check docker-compose version"
docker-compose version

echo "Check existing processes"
ps -ef | grep [o]pensearch | wc -l
echo "Cleanup existing processes"
kill -9 `ps -ef | grep [o]pensearch | awk '{print \$2}'` > /dev/null 2>&1 || echo
ps -ef | grep [o]pensearch | wc -l

echo "Start gradlecheck"
GRADLE_CHECK_STATUS=0
./gradlew check -Dtests.coverage=true --no-daemon --no-scan || GRADLE_CHECK_STATUS=1
Expand Down