Move cargo installation for release inside dotnet context (which sets…

… HOME) (#2059)
elastic · Apr 26, 2023 · e5f767d · e5f767d
1 parent ba01b17
commit e5f767d
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -497,8 +497,6 @@ pipeline {
         deleteDir()
         unstash 'source'
         dir("${BASE_DIR}"){
-          sh label: 'Rustup', script: 'rustup default 1.67.1'
-          sh label: 'Cargo make', script: 'cargo install --force cargo-make'
           release(secret: 'secret/apm-team/ci/elastic-observability-feedz.io', withSuffix: true)
         }
       }
@@ -538,8 +536,6 @@ pipeline {
             deleteDir()
             unstash 'source'
             dir("${BASE_DIR}") {
-              sh label: 'Rustup', script: 'rustup default 1.67.1'
-              sh label: 'Cargo make', script: 'cargo install --force cargo-make'
               release(secret: 'secret/apm-team/ci/elastic-observability-nuget')
             }
           }
@@ -699,6 +695,8 @@ def release(Map args = [:]){
   def secret = args.secret
   def withSuffix = args.get('withSuffix', false)
   dotnet(){
+    sh label: 'Rustup', script: 'rustup default 1.67.1'
+    sh label: 'Cargo make', script: 'cargo install --force cargo-make'
     sh(label: 'Release', script: ".ci/linux/release.sh ${withSuffix}")
     def repo = getVaultSecret(secret: secret)
     wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [