Skip to content

Commit 71e715c

Browse files
committed
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
2 parents 72adc0f + 222c383 commit 71e715c

5 files changed

+63
-12
lines changed

jenkinsfile/Jenkinsfile_MR_crossAndroid

+8-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,14 @@ pipeline {
155155
stage('Download prebuilt third-party-sources'){
156156
steps {
157157
dir("sdk/src/main/jni"){
158-
sh "jf rt download third-party-sources-sdk/3rdparty-sdk.tar.gz ."
158+
withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
159+
sh """
160+
jf rt download \
161+
--url ${REPO_URL} \
162+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
163+
third-party-sources-sdk/3rdparty-sdk.tar.gz .
164+
"""
165+
}
159166
sh "tar -xf 3rdparty-sdk.tar.gz --skip-old-files"
160167
}
161168
}

jenkinsfile/Jenkinsfile_MR_linux_megaclc

+17-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,23 @@ pipeline {
128128
}
129129
stage('Upload MEGAclc'){
130130
steps {
131-
sh "jf rt del MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/ || true"
132-
sh "cd build_ubuntu2204/examples/megaclc/ && jf rt upload megaclc MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/x64/"
131+
withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
132+
sh """
133+
jf rt del \
134+
--url ${REPO_URL} \
135+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
136+
MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/ \
137+
|| true
138+
"""
139+
dir ("build_ubuntu2204/examples/megaclc/"){
140+
sh """
141+
jf rt upload \
142+
--url ${REPO_URL} \
143+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
144+
megaclc MEGAchat/${env.gitlabMergeRequestIid}/ubuntu2204/megaclc/x64/
145+
"""
146+
}
147+
}
133148
}
134149
}
135150
}

jenkinsfile/Jenkinsfile_MR_macOS_cmake

+25-3
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,31 @@ pipeline {
145145
script {
146146
uploadMegaclcExecuted = true
147147
}
148-
sh "jf rt del MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/ || true"
149-
sh "cd ${BUILD_DIR}/examples/megaclc/ && jf rt upload megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/arm64/"
150-
sh "cd ${BUILD_DIR_X64}/examples/megaclc/ && jf rt upload megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/x64/"
148+
withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
149+
sh """
150+
jf rt del \
151+
--url ${REPO_URL} \
152+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
153+
MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/ \
154+
|| true
155+
"""
156+
dir("${BUILD_DIR}/examples/megaclc/"){
157+
sh """
158+
jf rt upload \
159+
--url ${REPO_URL} \
160+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
161+
megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/arm64/
162+
"""
163+
}
164+
dir("${BUILD_DIR_X64}/examples/megaclc/"){
165+
sh """
166+
jf rt upload \
167+
--url ${REPO_URL} \
168+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
169+
megaclc MEGAchat/${env.gitlabMergeRequestIid}/macos/megaclc/x64/
170+
"""
171+
}
172+
}
151173
}
152174
}
153175
}

jenkinsfile/Jenkinsfile_MR_windows_cmake

+5-5
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ pipeline {
142142
uploadMegaclcExecuted = true
143143
def windows_artifactory_upload = { String ART_UPLOAD_PATH ->
144144

145-
powershell """
146-
${JF_PATH}\\jf config use artifactory
147-
${JF_PATH}\\jf rt del ${ART_UPLOAD_PATH}
148-
${JF_PATH}\\jf rt upload megaclc.exe ${ART_UPLOAD_PATH}
149-
"""
145+
withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
146+
powershell """
147+
${JF_PATH}\\jf rt del --url ${REPO_URL} --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} ${ART_UPLOAD_PATH}
148+
${JF_PATH}\\jf rt upload --url ${REPO_URL} --access-token ${MEGACHAT_ARTIFACTORY_TOKEN} megaclc.exe ${ART_UPLOAD_PATH}
149+
"""
150150
}
151151
windows_artifactory_upload("MEGAchat/${env.gitlabMergeRequestIid}/windows/megaclc/")
152152
}

jenkinsfile/specific_branches/MEGAChat_crossAndroid_develop.groovy

+8-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,14 @@ pipeline {
5858
stage('Download prebuilt third-party-sources'){
5959
steps {
6060
dir("sdk/src/main/jni"){
61-
sh "jf rt download third-party-sources-sdk/3rdparty-sdk.tar.gz ."
61+
withCredentials([string(credentialsId: 'MEGACHAT_ARTIFACTORY_TOKEN', variable: 'MEGACHAT_ARTIFACTORY_TOKEN')]) {
62+
sh """
63+
jf rt download \
64+
--url ${REPO_URL} \
65+
--access-token ${MEGACHAT_ARTIFACTORY_TOKEN} \
66+
third-party-sources-sdk/3rdparty-sdk.tar.gz .
67+
"""
68+
}
6269
sh "tar -xf 3rdparty-sdk.tar.gz --skip-old-files"
6370
}
6471
}

0 commit comments

Comments
 (0)