Moved to shared pipeline library.

osechet · Dec 19, 2017 · a0fc370 · a0fc370
1 parent 78bd46f
commit a0fc370
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 160 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,159 +1,5 @@
-pipeline {
-  agent none
-  options {
-    ansiColor('xterm')
-    timestamps()
-  }
-  stages {
-    stage('Build') {
-      parallel {
-        // *************************** gcc49 ************************************
-        stage('gcc49') {
-          agent {
-            docker {
-              image 'ogs6/conangcc49'
-              label 'docker'
-              args '-v /home/jenkins/.ccache:/usr/src/.ccache'
-              alwaysPull true
-            }
-          }
-          environment {
-            CONAN_REFERENCE = "Qt/5.9.2"
-            JFROG = credentials('3a3e2a63-4509-43c9-a2e9-ea0c50fdcd4c')
-            CONAN_USERNAME = "bilke"
-            CONAN_CHANNEL = "testing"
-            CONAN_UPLOAD = "https://ogs.jfrog.io/ogs/api/conan/conan"
-            CONAN_STABLE_BRANCH_PATTERN = "release/*"
-            CONAN_GCC_VERSIONS = "4.9"
-            CONAN_USER_HOME = "$WORKSPACE/conan"
-          }
-          steps {
-            script {
-              withEnv(['CONAN_LOGIN_USERNAME=$JFROG_USR', 'CONAN_PASSWORD=$JFROG_PSW']) {
-                sh 'sudo ./.travis/install.sh'
-                sh 'conan user'
-                sh './.travis/run.sh'
-                sh 'rm -r $CONAN_USER_HOME'
-              }
-            }
-          }
-        }
-        // *************************** gcc5 ************************************
-        stage('gcc5') {
-          agent {
-            docker {
-              image 'ogs6/conangcc5'
-              label 'docker'
-              args '-v /home/jenkins/.ccache:/usr/src/.ccache'
-              alwaysPull true
-            }
-          }
-          environment {
-            CONAN_REFERENCE = "Qt/5.9.2"
-            JFROG = credentials('3a3e2a63-4509-43c9-a2e9-ea0c50fdcd4c')
-            CONAN_USERNAME = "bilke"
-            CONAN_CHANNEL = "testing"
-            CONAN_UPLOAD = "https://ogs.jfrog.io/ogs/api/conan/conan"
-            CONAN_STABLE_BRANCH_PATTERN = "release/*"
-            CONAN_GCC_VERSIONS = "5"
-            CONAN_USER_HOME = "$WORKSPACE/conan"
-          }
-          steps {
-            script {
-              withEnv(['CONAN_LOGIN_USERNAME=$JFROG_USR', 'CONAN_PASSWORD=$JFROG_PSW']) {
-                sh 'sudo ./.travis/install.sh'
-                sh 'conan user'
-                sh './.travis/run.sh'
-                sh 'rm -r $CONAN_USER_HOME'
-              }
-            }
-          }
-        }
-        // *************************** gcc6 ************************************
-        stage('gcc6') {
-          agent {
-            docker {
-              image 'ogs6/conangcc6'
-              label 'docker'
-              args '-v /home/jenkins/.ccache:/usr/src/.ccache'
-              alwaysPull true
-            }
-          }
-          environment {
-            CONAN_REFERENCE = "Qt/5.9.2"
-            JFROG = credentials('3a3e2a63-4509-43c9-a2e9-ea0c50fdcd4c')
-            CONAN_USERNAME = "bilke"
-            CONAN_CHANNEL = "testing"
-            CONAN_UPLOAD = "https://ogs.jfrog.io/ogs/api/conan/conan"
-            CONAN_STABLE_BRANCH_PATTERN = "release/*"
-            CONAN_GCC_VERSIONS = "6"
-            CONAN_USER_HOME = "$WORKSPACE/conan"
-          }
-          steps {
-            script {
-              withEnv(['CONAN_LOGIN_USERNAME=$JFROG_USR', 'CONAN_PASSWORD=$JFROG_PSW']) {
-                sh 'sudo ./.travis/install.sh'
-                sh 'conan user'
-                sh './.travis/run.sh'
-                sh 'rm -r $CONAN_USER_HOME'
-              }
-            }
-          }
-        }
-        // *************************** gcc7 ************************************
-        stage('gcc7') {
-          agent {
-            docker {
-              image 'ogs6/conangcc7'
-              label 'docker'
-              args '-v /home/jenkins/.ccache:/usr/src/.ccache'
-              alwaysPull true
-            }
-          }
-          environment {
-            CONAN_REFERENCE = "Qt/5.9.2"
-            JFROG = credentials('3a3e2a63-4509-43c9-a2e9-ea0c50fdcd4c')
-            CONAN_USERNAME = "bilke"
-            CONAN_CHANNEL = "testing"
-            CONAN_UPLOAD = "https://ogs.jfrog.io/ogs/api/conan/conan"
-            CONAN_STABLE_BRANCH_PATTERN = "release/*"
-            CONAN_GCC_VERSIONS = "7"
-            CONAN_USER_HOME = "$WORKSPACE/conan"
-          }
-          steps {
-            script {
-              withEnv(['CONAN_LOGIN_USERNAME=$JFROG_USR', 'CONAN_PASSWORD=$JFROG_PSW']) {
-                sh 'sudo ./.travis/install.sh'
-                sh 'conan user'
-                sh './.travis/run.sh'
-                sh 'rm -r $CONAN_USER_HOME'
-              }
-            }
-          }
-        }
-        // ************************** vs2017 ***********************************
-        stage('vs2017') {
-          agent {label 'win && conan' }
-          environment {
-            CONAN_REFERENCE = "Qt/5.9.2"
-            JFROG = credentials('3a3e2a63-4509-43c9-a2e9-ea0c50fdcd4c')
-            CONAN_USERNAME = "bilke"
-            CONAN_CHANNEL = "testing"
-            CONAN_UPLOAD = "https://ogs.jfrog.io/ogs/api/conan/conan"
-            CONAN_STABLE_BRANCH_PATTERN = "release/*"
-            CONAN_VISUAL_VERSIONS = "15"
-            CONAN_USER_HOME = "$WORKSPACE\\conan"
-          }
-          steps {
-            script {
-              withEnv(['CONAN_LOGIN_USERNAME=%JFROG_USR%', 'CONAN_PASSWORD=%JFROG_PSW%']) {
-                bat 'python build.py'
-                bat 'rd /S /Q %CONAN_USER_HOME%'
-              }
-            }
-          }
-        }
-      } // end parallel
-    }
-  }
-}
+@Library('jenkins-pipeline') _
+
+// Implementation at:
+// https://github.com/ufz/jenkins-pipeline-library/blob/master/vars/conanBuild.groovy
+conanBuild { reference: "Qt/5.9.2" }
diff --git a/build.py b/build.py
@@ -17,10 +17,11 @@ def main():
         if settings["arch"] != "x86_64":
             continue
 
-        filtered_builds.append([settings, options, env_vars, build_requires])
         new_options = copy.copy(options)
         new_options["Qt:xmlpatterns"] = True
+
         filtered_builds.append([settings, new_options, env_vars, build_requires])
+        filtered_builds.append([settings, options, env_vars, build_requires])
 
     builder.builds = filtered_builds
     builder.run()