From f0b6ec387e9808b7d358cb4acb4596a146b50adc Mon Sep 17 00:00:00 2001
From: Dany LE <xsang.le@gmail.com>
Date: Sun, 7 Aug 2022 11:10:09 +0200
Subject: [PATCH] add artifact

---
 Jenkinsfile                  | 29 +++++++++++++++++++++--------
 bin/build_base_image_diya.sh |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 628149b..53d029d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline{
   }
   stages
   {
-    stage('Build image') {
+    stage('Build 32 bit image') {
       agent {
           docker {
               image 'xsangle/ci-yocto:focal'
@@ -32,20 +32,33 @@ pipeline{
         printenv
         source ./env.sh
         diya -c 32
-        diya -c 64
         diya -b 32
+       '''
+      }
+    }
+    stage('Build 64 bit image') {
+      agent {
+          docker {
+              image 'xsangle/ci-yocto:focal'
+              args ' --user root '
+              // args '-v /var/jenkins_home/workspace/ant-http:/var/jenkins_home/workspace/ant-http'
+              reuseNode true
+          }
+      }
+      steps {
+        sh '''#!/bin/bash
+        printenv
+        source ./env.sh
+        diya -c 64
         diya -b 64
        '''
       }
     }
     stage('Archive') {
       steps {
-        //script {
-            //archiveArtifacts artifacts: 'build/tmp/deploy/images/', fingerprint: true
-        //}
-        sh '''
-        echo "DONE"
-        '''
+        script {
+          archiveArtifacts artifacts: '64/tmp/diya.image,32/tmp/diya.image,fonts/', fingerprint: true
+        }
       }
     }
   }
diff --git a/bin/build_base_image_diya.sh b/bin/build_base_image_diya.sh
index 7f3c87c..289984a 100755
--- a/bin/build_base_image_diya.sh
+++ b/bin/build_base_image_diya.sh
@@ -22,7 +22,7 @@ if [ ! -e "$SRC_IMG" ]; then
     cd "$W"
 fi
 cp -rf "$W/fonts" "$BASE_DIR/builder/" 
-chmod  -R a+rw $BASE_DIR
+# chmod  -R a+rw $BASE_DIR
 $VM "$SRC_IMG" "$W/install.st" --quit
 NAME="Diya-Bootstrap"
 $VM "$SRC_IMG" "$W/export.st" "$BASE_DIR/tmp" "$NAME" --quit