From d2439cdf1589923a6e745a15790dcbfe1fb2a74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Mon, 6 Nov 2023 17:25:24 +0100
Subject: [PATCH] fix(ci): archive artifacts in pkg folder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows jenkins.copyArts() to work with meta-jobs.

Required for:
https://github.com/status-im/desktop-qa-automation/pull/270

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/Jenkinsfile.combined | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index f87a010cb6..ec9758eb66 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -18,6 +18,8 @@ pipeline {
       daysToKeepStr: '30',
       artifactNumToKeepStr: '10',
     ))
+    /* Allows combined build to copy */
+    copyArtifactPermission('/status-desktop/*')
   }
 
   parameters {
@@ -74,14 +76,16 @@ pipeline {
     }
   }
   post {
-    always { script { dir('pkg') {
-      /* Generate sha256 checksums for all artifacts. */
-      sha = "./${utils.pkgFilename(ext: 'sha256')}"
-      sh "sha256sum * | tee ../${sha}"
-      archiveArtifacts('*')
-      urls['SHA'] = s3.uploadArtifact(sha)
-      jenkins.setBuildDesc(urls)
-    } } }
+    always { script {
+      dir('pkg') {
+        /* Generate sha256 checksums for all artifacts. */
+        sha = "./${utils.pkgFilename(ext: 'sha256')}"
+        sh "sha256sum * | tee ./${sha}"
+        urls['SHA'] = s3.uploadArtifact(sha)
+        jenkins.setBuildDesc(urls)
+      }
+      archiveArtifacts('pkg/*')
+    } }
     failure { script {
       withCredentials([
         string(