Unverified Commit 3eac222b authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Merge pull request #623 from evindunn/dev

Updates Jenkinsfile to work with Docker Plugin
parents 23536d3a 88a02c76
Loading
Loading
Loading
Loading
+40 −52
Original line number Diff line number Diff line
@@ -6,17 +6,11 @@ pipeline {
        ISIS3DATA="/usgs/cpkgs/isis3/data/"
    }
    stages {
        stage('Build') {
            parallel {
                stage('Fedora25') {
                    agent {
                docker {
                    label 'cmake'
                    image 'chrisryancombs/docker_isis'
                    args  '''\
                            -v /usgs/cpkgs/isis3/data:/usgs/cpkgs/isis3/data \
                            -v /usgs/cpkgs/isis3/testData:/usgs/cpkgs/isis3/testData\
                            -v /usgs/cpkgs/isis3/isis3mgr_scripts:/usgs/cpkgs/isis3/isis3mgr_scripts
                          '''  
                }
                        label 'isis-fedora-25'
                    }
                    steps {
                        sh """
@@ -36,15 +30,7 @@ pipeline {
                }
                stage('CentOS7') {
                    agent {
                docker {
                    label 'cmake_cool'
                    image 'chrisryancombs/docker_isis_centos'
                    args  '''\
                            -v /usgs/cpkgs/isis3/data:/usgs/cpkgs/isis3/data \
                            -v /usgs/cpkgs/isis3/testData:/usgs/cpkgs/isis3/testData\
                            -v /usgs/cpkgs/isis3/isis3mgr_scripts:/usgs/cpkgs/isis3/isis3mgr_scripts
                          '''  
                }
                        label 'isis-centos-7'
                    }
                    steps {
                        sh """
@@ -60,6 +46,8 @@ pipeline {
                    }
                }
            }
        }
    }
//    post {
//        success {
//            sh 'pwd && ls'