Merge pull request #3 from mnordsletten/master

Jenkins + conan improvements

Author: KristianJerpetjon

Jenkinsfile

@@ -1,72 +1,60 @@
 pipeline {
   agent { label 'ubuntu-18.04' }
-
+  triggers { upstream( upstreamProjects: 'IncludeOS/IncludeOS/master, IncludeOS/IncludeOS/dev', threshold: hudson.model.Result.SUCCESS ) }
+  options { checkoutToSubdirectory('src') }
   environment {
     CONAN_USER_HOME = "${env.WORKSPACE}"
     PROFILE_x86_64 = 'clang-6.0-linux-x86_64'
-    PROFILE_x86 = 'clang-6.0-linux-x86'
     CPUS = """${sh(returnStdout: true, script: 'nproc')}"""
-    CC = 'clang-6.0'
-    CXX = 'clang++-6.0'
     PACKAGE = 'diskbuilder'
     USER = 'includeos'
-    CHAN = 'test'
+    CHAN_LATEST = 'latest'
+    CHAN_STABLE = 'stable'
     REMOTE = "${env.CONAN_REMOTE}"
     BINTRAY_CREDS = credentials('devops-includeos-user-pass-bintray')
+    SRC = "${env.WORKSPACE}/src"
   }
 
   stages {
     stage('Setup') {
       steps {
+        sh script: "ls -A | grep -v src | xargs rm -r || :", label: "Clean workspace"
         sh script: "conan config install https://github.com/includeos/conan_config.git", label: "conan config install"
       }
     }
-    stage('Pull Request pipeline') {
-      when { changeRequest() }
-      stages {
-        stage('Build package') {
-          steps {
-            build_conan_package("$PROFILE_x86_64")
-          }
-        }
+    stage('Build package') {
+      steps {
+        build_conan_package("$PROFILE_x86_64")
+        script { VERSION = sh(script: "conan inspect -a version $SRC | cut -d ' ' -f 2", returnStdout: true).trim() }
       }
     }
-    stage('Deploy package pipeline') {
-      when {
-        anyOf {
-          branch 'master'
-        }
-      }
-      stages {
-        stage('Build Conan package') {
+    stage('Upload to bintray') {
+      parallel {
+        stage('Latest release') {
+          when { branch 'master' }
           steps {
-            //TODO foreach profile ?
-            build_conan_package("$PROFILE_x86_64")
+            upload_package("$CHAN_LATEST")
           }
         }
-        stage('Upload to bintray') {
+        stage('Stable release') {
+          when { buildingTag() }
           steps {
-            sh script: """
-              conan user -p $BINTRAY_CREDS_PSW -r $REMOTE $BINTRAY_CREDS_USR
-              VERSION=\$(conan inspect -a version . | cut -d " " -f 2)
-              conan upload --all -r $REMOTE $PACKAGE/\$VERSION@$USER/$CHAN
-            """, label: "Upload to bintray"
+            sh script: "conan copy --all $PACKAGE/$VERSION@$USER/$CHAN_LATEST $USER/$CHAN_STABLE", label: "Copy to stable channel"
+            upload_package("$CHAN_STABLE")
           }
         }
       }
     }
   }
-  post {
-    cleanup {
-      sh script: """
-        VERSION=\$(conan inspect -a version . | cut -d " " -f 2)
-        conan remove $PACKAGE/\$VERSION@$USER/$CHAN -f || echo 'Could not remove. This does not fail the pipeline'
-      """, label: "Cleaning up and removing conan package"
-    }
-  }
 }
 
-
 def build_conan_package(String profile) {
-  sh script: "conan create . $USER/$CHAN -pr ${profile}", label: "Build with profile: $profile"
+  sh script: "conan create $SRC $USER/$CHAN_LATEST -pr ${profile}", label: "Build with profile: $profile"
+}
+
+def upload_package(String channel) {
+  sh script: """
+    conan user -p $BINTRAY_CREDS_PSW -r $REMOTE $BINTRAY_CREDS_USR
+    conan upload --all -r $REMOTE $PACKAGE/$VERSION@$USER/$channel
+  """, label: "Upload to bintray"
 }

conanfile.py

@@ -1,30 +1,11 @@
 import os
-from conans import ConanFile,tools,CMake
-
-def get_version():
-    git = tools.Git()
-    try:
-        prev_tag = git.run("describe --tags --abbrev=0")
-        commits_behind = int(git.run("rev-list --count %s..HEAD" % (prev_tag)))
-        # Commented out checksum due to a potential bug when downloading from bintray
-        #checksum = git.run("rev-parse --short HEAD")
-        if prev_tag.startswith("v"):
-            prev_tag = prev_tag[1:]
-        if commits_behind > 0:
-            prev_tag_split = prev_tag.split(".")
-            prev_tag_split[-1] = str(int(prev_tag_split[-1]) + 1)
-            output = "%s-%d" % (".".join(prev_tag_split), commits_behind)
-        else:
-            output = "%s" % (prev_tag)
-        return output
-    except:
-        return '0.0.0'
-
+from conans import ConanFile, python_requires, CMake
+conan_tools = python_requires("conan-tools/[>=1.0.0]@includeos/stable")
 
 class DiskbuilderConan(ConanFile):
     settings="os_build","arch_build"
     name = "diskbuilder"
-    version = get_version()
+    version = conan_tools.git_get_semver()
     license = "Apache-2.0"
     description = "A tool to create an IncludeOS binary filesystem image"
     scm = {
@@ -36,7 +17,7 @@ class DiskbuilderConan(ConanFile):
     generators='cmake'
     no_copy_source=True
     default_user="includeos"
-    default_channel="test"
+    default_channel="latest"
 
     def _cmake_configure(self):
         cmake=CMake(self)