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

Updated master to v4md 2.4.1 and MD 190sp4 #15

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated master to v4md 2.4.1 and MD 190sp4 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f32db99
Updated mater 19 to v4md 2.4.1 and MD 190sp4
kkadosa Nov 13, 2020
9ac45ee
Jenkinsfile fix
kkadosa Nov 13, 2020
504ddba
Added credentials to run.sh too
kkadosa Nov 13, 2020
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
40 changes: 22 additions & 18 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,32 @@ pipeline {
stages {
stage('Build') {
steps {
sh '''
# WORKSPACE_BENCHMARK is used as on client-side 3rd applications (e.g. git on Windows)
# overrides the $WORKSPACE variable during their execution
export WORKSPACE_BENCHMARK=$WORKSPACE
rm -rf benhmark/results
rm -rf benhmark/diagrams
cd com.incquerylabs.magicdraw.benchmark
rm -rf results
rm -rf build/dependency-cache
./gradlew clean
./gradlew installDist
'''
withCredentials([usernamePassword(credentialsId: 'nexus-buildserver-deploy', passwordVariable: 'DEPLOY_PASSWORD', usernameVariable: 'DEPLOY_USER')]) {
sh '''
# WORKSPACE_BENCHMARK is used as on client-side 3rd applications (e.g. git on Windows)
# overrides the $WORKSPACE variable during their execution
export WORKSPACE_BENCHMARK=$WORKSPACE
rm -rf benhmark/results
rm -rf benhmark/diagrams
cd com.incquerylabs.magicdraw.benchmark
rm -rf results
rm -rf build/dependency-cache
./gradlew clean -PnexusUsername=$DEPLOY_USER -PnexusPassword=$DEPLOY_PASSWORD
./gradlew installDist -PnexusUsername=$DEPLOY_USER -PnexusPassword=$DEPLOY_PASSWORD
'''
}
}
}
stage('Benchmark') {
steps {
wrap([$class: 'Xvnc']) {
sh '''
export MODEL_LOCATION=/home/jenkins/models-tmt
./com.incquerylabs.magicdraw.benchmark/run.sh
'''
}
withCredentials([usernamePassword(credentialsId: 'nexus-buildserver-deploy', passwordVariable: 'DEPLOY_PASSWORD', usernameVariable: 'DEPLOY_USER')]) {
wrap([$class: 'Xvnc']) {
sh '''
export MODEL_LOCATION=/home/jenkins/models-tmt
./com.incquerylabs.magicdraw.benchmark/run.sh
'''
}
}
}
}
stage('Report') {
Expand Down
15 changes: 8 additions & 7 deletions com.incquerylabs.magicdraw.benchmark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,13 @@ sourceSets {

// In this section you declare where to find the dependencies of your project
repositories {
ivy {
url 'http://download1.nomagic.com/'
layout 'pattern', {
artifact '/[module][revision]/[classifier].[ext]'
maven {
url "https://build.incquerylabs.com/nexus/repository/nomagic-binaries/"
credentials {
username = "$nexusUsername"
password = "$nexusPassword"
}
}
}
jcenter()
mavenCentral()
maven { url 'https://build.incquerylabs.com/nexus/repository/v4md/' }
Expand Down Expand Up @@ -89,8 +90,8 @@ dependencies {
exclude module: 'org.eclipse.xtext.xtext.generator' //version number replacement
}

preCompile group: 'com.nomagic', name: 'magicdraw', version: '190', classifier: 'MagicDraw_190_no_install', ext: 'zip'
preCompile group: 'com.nomagic', name: 'sysml', version: '190', classifier: 'SysML_Plugin_190_bundle', ext: 'zip'

preCompile group: 'com.nomagic', name: 'csm', version: '190sp4', classifier: 'no_install', ext: 'zip'
preCompile group: 'com.incquerylabs.v4md', name: 'com.incquerylabs.v4md', version: v4mdVersion, classifier: 'plugin', ext: 'zip'

compile group: 'org.eclipse.viatra', name: 'viatra-query-language', version: viatraVersion, exclusions
Expand Down
4 changes: 2 additions & 2 deletions com.incquerylabs.magicdraw.benchmark/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ pluginName = Benchmark Plugin
group=com.incquerylabs.magicdraw.benchmark
descriptorFile=MDR_Example_Plugin_18351_descriptor.xml
magicDrawGroupName=com.incquerylabs.magicdraw.benchmark
viatraVersion=2.3.0.M4
v4mdVersion=2.3.0.M4
viatraVersion=2.4.1
v4mdVersion=2.4.1
xtextVersion=2.18.0
2 changes: 1 addition & 1 deletion com.incquerylabs.magicdraw.benchmark/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ do

# Call MD
./gradlew -Pquery="$query" -Pmodel="${MODEL_LOCATION}/TMT$size.mdzip" -Pwarmup="${MODEL_LOCATION}/Warmup.mdzip" -Pindex="$runIndex" -Psize="$size" \
-Poutput="${OUTPUT_DIR}" -Pengine="$engine" -Pexclude="$BENCHMARK_QUERIES_EXCLUDE" runBenchmark
-Poutput="${OUTPUT_DIR}" -Pengine="$engine" -Pexclude="$BENCHMARK_QUERIES_EXCLUDE" runBenchmark -PnexusUsername=$DEPLOY_USER -PnexusPassword=$DEPLOY_PASSWORD
fi
done
done
Expand Down