Merge branch 'CHT-1379-use-project-art-credentials' into 'develop'

CHT-1379 - Use Artifactory credentials assigned to this project Closes CHT-1379 See merge request megachat/MEGAchat!2016
meganz · Nov 22, 2024 · 71e715c · 71e715c
2 parents 72adc0f + 222c383
commit 71e715c
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 12 deletions.
diff --git a/jenkinsfile/Jenkinsfile_MR_crossAndroid b/jenkinsfile/Jenkinsfile_MR_crossAndroid
@@ -155,7 +155,14 @@ pipeline {
         stage('Download prebuilt third-party-sources'){
             steps {
                 dir("sdk/src/main/jni"){
-                    sh "jf rt download third-party-sources-sdk/3rdparty-sdk.tar.gz ."
+                    withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
+                        sh """
+                            jf rt download \
+                                --url ${REPO_URL} \
+                                --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                                third-party-sources-sdk/3rdparty-sdk.tar.gz .
+                        """
+                    }
                     sh "tar -xf 3rdparty-sdk.tar.gz --skip-old-files"
                 }
             }

diff --git a/jenkinsfile/Jenkinsfile_MR_linux_megaclc b/jenkinsfile/Jenkinsfile_MR_linux_megaclc
@@ -128,8 +128,23 @@ pipeline {
         }
         stage('Upload MEGAclc'){
             steps {
-                sh "jf rt del MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/ || true"
-                sh "cd build_ubuntu2204/examples/megaclc/ && jf rt upload megaclc MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/x64/"
+                withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
+                    sh """
+                        jf rt del \
+                            --url ${REPO_URL} \
+                            --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                            MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/ \
+                        || true
+                    """
+                    dir ("build_ubuntu2204/examples/megaclc/"){
+                        sh """
+                            jf rt upload \
+                                --url ${REPO_URL} \
+                                --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                                megaclc MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/x64/
+                        """
+                    }
+                }
             }
         }
     }

diff --git a/jenkinsfile/Jenkinsfile_MR_macOS_cmake b/jenkinsfile/Jenkinsfile_MR_macOS_cmake
@@ -145,9 +145,31 @@ pipeline {
                 script {
                     uploadMegaclcExecuted = true     
                 }                   
-                sh "jf rt del MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/ || true"
-                sh "cd ${BUILD_DIR}/examples/megaclc/ && jf rt upload megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/arm64/"
-                sh "cd ${BUILD_DIR_X64}/examples/megaclc/ && jf rt upload megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/x64/"
+                withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
+                    sh """
+                        jf rt del \
+                            --url ${REPO_URL} \
+                            --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                            MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/ \
+                        || true
+                    """
+                    dir("${BUILD_DIR}/examples/megaclc/"){
+                        sh """
+                            jf rt upload \
+                                --url ${REPO_URL} \
+                                --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                                megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/arm64/
+                        """
+                    }
+                    dir("${BUILD_DIR_X64}/examples/megaclc/"){
+                        sh """
+                            jf rt upload \
+                                --url ${REPO_URL} \
+                                --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                                megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/x64/
+                        """
+                    }
+                }
             }
         }
     }

diff --git a/jenkinsfile/Jenkinsfile_MR_windows_cmake b/jenkinsfile/Jenkinsfile_MR_windows_cmake
@@ -142,11 +142,11 @@ pipeline {
                         uploadMegaclcExecuted = true
                         def windows_artifactory_upload = { String ART_UPLOAD_PATH ->
 
-                            powershell """
-                                ${JF_PATH}\\jf config use artifactory
-                                ${JF_PATH}\\jf rt del ${ART_UPLOAD_PATH}
-                                ${JF_PATH}\\jf rt upload megaclc.exe ${ART_UPLOAD_PATH}
-                            """
+                            withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
+                                powershell """
+                                    ${JF_PATH}\\jf rt del --url ${REPO_URL} --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} ${ART_UPLOAD_PATH}
+                                    ${JF_PATH}\\jf rt upload --url ${REPO_URL} --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} megaclc.exe ${ART_UPLOAD_PATH}
+                                """
                         }
                         windows_artifactory_upload("MEGAchat/${env.gitlabMergeRequestIid}/windows/megaclc/")
                     }

diff --git a/jenkinsfile/specific_branches/MEGAChat_crossAndroid_develop.groovy b/jenkinsfile/specific_branches/MEGAChat_crossAndroid_develop.groovy
@@ -58,7 +58,14 @@ pipeline {
         stage('Download prebuilt third-party-sources'){
             steps {
                 dir("sdk/src/main/jni"){
-                    sh "jf rt download third-party-sources-sdk/3rdparty-sdk.tar.gz ."
+                    withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
+                        sh """
+                            jf rt download \
+                                --url ${REPO_URL} \
+                                --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
+                                third-party-sources-sdk/3rdparty-sdk.tar.gz .
+                        """
+                    }
                     sh "tar -xf 3rdparty-sdk.tar.gz --skip-old-files"
                 }
             }