diff --git a/Jenkinsfile-eval b/Jenkinsfile-eval index fe63c8b..feca622 100644 --- a/Jenkinsfile-eval +++ b/Jenkinsfile-eval @@ -1,20 +1,26 @@ node { stage('Preparation') { properties([ - pipelineTriggers([ - // TODO change auto run after train - upstream( - threshold: hudson.model.Result.SUCCESS, - upstreamProjects: 's424714-create-dataset' - ) - ]), - copyArtifactPermission('*'), + // pipelineTriggers([ + // // TODO change auto run after train + // upstream( + // threshold: hudson.model.Result.SUCCESS, + // upstreamProjects: 's424714-create-dataset' + // ) + // ]), + // copyArtifactPermission('*'), parameters([ buildSelector( defaultSelector: lastSuccessful(), description: 'Which build to use for copying artifacts', name: 'BUILD_SELECTOR' ), + buildSelector( + defaultSelector: lastSuccessful(), + description: 'Which build of train to use for copying artifacts', + name: 'BUILD_SELECTOR_TRAINING' + ), + gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' ]) ]) @@ -31,7 +37,8 @@ node { sh "chmod +x -R ${env.WORKSPACE}" copyArtifacts fingerprintArtifacts: true, projectName: 's424714-create-dataset', selector: buildParameter('BUILD_SELECTOR') //TODO from train - copyArtifacts filter: '*', projectName: 's424714-training/train' + sh "echo git parameter: ${params.BRANCH}" + copyArtifacts filter: '*', projectName: 's424714-training/${params.BRANCH}' selector: buildParameter('BUILD_SELECTOR_TRAINING') // copyArtifacts filter('*.csv') projectName: env.JOB_NAME, selector: specific(env.BUILD_NUMBER) // copyArtifacts fingerprintArtifacts: true, projectName: 's424714-create-dataset', selector: buildParameter('BUILD_SELECTOR') diff --git a/Jenkinsfile-training b/Jenkinsfile-training index 70e2e34..285e3bc 100644 --- a/Jenkinsfile-training +++ b/Jenkinsfile-training @@ -74,4 +74,7 @@ node { sh 'ls' archiveArtifacts artifacts: '*.pt' } + stage('Triggering eval job') { + build job: "s424714-evaluation/master", wait: false + } } \ No newline at end of file