Git and build parametrs in eval from train.
Some checks failed
s426206-training/pipeline/head There was a failure building this commit
s426206-evaluation/pipeline/head There was a failure building this commit

This commit is contained in:
Jan Nowak 2021-05-16 09:37:12 +02:00
parent 6bbc314728
commit dfe8074450
3 changed files with 30 additions and 20 deletions

View File

@ -27,3 +27,5 @@ COPY ./create_dataset.py ./
RUN chmod +x create_dataset.py RUN chmod +x create_dataset.py
COPY ./evaluation.py ./ COPY ./evaluation.py ./
RUN chmod +x evaluation.py RUN chmod +x evaluation.py
COPY ./plot.py ./
RUN chmod +x plot.py

View File

@ -1,14 +1,23 @@
pipeline { pipeline {
agent any agent any
triggers { // triggers {
upstream(upstreamProjects: "s426206-train", // upstream(upstreamProjects: "s426206-train/master",
threshold: hudson.model.Result.SUCCESS) // threshold: hudson.model.Result.SUCCESS)
} // }
parameters { parameters {
buildSelector( buildSelector(
defaultSelector: lastSuccessful(), defaultSelector: lastSuccessful(),
description: 'Which build to use for copying artifacts', description: 'Which build to use for copying artifacts for training',
name: 'BUILD_SELECTOR') name: 'BUILD_SELECTOR_TRAINING')
buildSelector(
defaultSelector: lastSuccessful(),
description: 'Which build to use for copying artifacts for dataset',
name: 'BUILD_SELECTOR_DATASET')
buildSelector(
defaultSelector: lastSuccessful(),
description: 'Which build to use for copying artifacts for evaluation',
name: 'BUILD_SELECTOR_EVALUATION')
gitParameter branch: '', branchFilter: '.*', defaultValue: 'master', description: '', name: 'BRANCH', quickFilterEnabled: false, selectedValue: 'NONE', sortMode: 'NONE', tagFilter: '*', type: 'PT_BRANCH'
} }
stages { stages {
stage('checkout') { stage('checkout') {
@ -18,9 +27,9 @@ pipeline {
} }
stage('Copy artifact') { stage('Copy artifact') {
steps { steps {
copyArtifacts filter: 'model.pt', fingerprintArtifacts: false, projectName: 's426206-training/master', selector: buildParameter('BUILD_SELECTOR') copyArtifacts filter: 'model.pt', fingerprintArtifacts: false, projectName: 's426206-training/${params.BRANCH}', selector: buildParameter('BUILD_SELECTOR_TRAINING')
copyArtifacts filter: 'val_dataset.pt', fingerprintArtifacts: false, projectName: 's426206-create-dataset', selector: buildParameter('BUILD_SELECTOR') copyArtifacts filter: 'val_dataset.pt', fingerprintArtifacts: false, projectName: 's426206-create-dataset', selector: buildParameter('BUILD_SELECTOR_DATASET')
copyArtifacts filter: 'metrics.tsv', fingerprintArtifacts: false, optional: true, projectName: 's426206-evaluation/master', selector: buildParameter('BUILD_SELECTOR') copyArtifacts filter: 'metrics.tsv', fingerprintArtifacts: false, optional: true, projectName: 's426206-evaluation/master', selector: buildParameter('BUILD_SELECTOR_EVALUATION')
} }
} }
stage('docker') { stage('docker') {

View File

@ -9,8 +9,7 @@ pipeline {
defaultValue: '', defaultValue: '',
description: 'Parametry trenowania.', description: 'Parametry trenowania.',
name: 'PARAMETRY', name: 'PARAMETRY',
trim: false trim: false)
)
buildSelector( buildSelector(
defaultSelector: lastSuccessful(), defaultSelector: lastSuccessful(),
description: 'Which build to use for copying artifacts', description: 'Which build to use for copying artifacts',
@ -54,7 +53,7 @@ pipeline {
subject: 's426206 train', subject: 's426206 train',
to: '26ab8f35.uam.onmicrosoft.com@emea.teams.ms' to: '26ab8f35.uam.onmicrosoft.com@emea.teams.ms'
//Uruchamianie innego zadania //Uruchamianie innego zadania
//build job: 's426206-evaluation/master', [string(name: 'BUILD_SELECTOR', value: '<StatusBuildSelector plugin="copyartifact@1.46"/>')] build job: 's426206-evaluation/master', [string(name: 'BUILD_SELECTOR', value: '<StatusBuildSelector plugin="copyartifact@1.46"/>')]
} }
unstable { unstable {