Adapt RubyGems publish action to opensearch-project/opensearch-build@0…

…1613af Closes opensearch-project#410 Signed-off-by: Earlopain <[email protected]>
Earlopain · Apr 14, 2024 · bd2c436 · bd2c436
1 parent c527d2f
commit bd2c436
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tests/jenkins/TestPublishToRubyGems.groovy b/tests/jenkins/TestPublishToRubyGems.groovy
@@ -28,7 +28,7 @@ class TestPublishToRubyGems extends BuildPipelineTest {
         assertThat(curlCommands, hasItem(
             "cd /tmp/workspace/dist && curl --fail --data-binary @`ls *.gem` -H 'Authorization:API_KEY' -H 'Content-Type: application/octet-stream' https://rubygems.org/api/v1/gems".toString()
         ))
-        assertThat(gemCommands, hasItem("#!/bin/bash\n        gem cert --add /tmp/workspace/certs/opensearch-rubygems.pem\n        source /usr/share/opensearch/.rvm/scripts/rvm && rvm use 2.6.0 && ruby --version\n        cd /tmp/workspace/dist && gemNameWithVersion=\$(ls *.gem)\n        gem install \$gemNameWithVersion\n        gemName=\$(echo \$gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem\$)//g')\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P MediumSecurity\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P HighSecurity\n    "))
+        assertThat(gemCommands, hasItem("#!/bin/bash\n        gem cert --add /tmp/workspace/certs/opensearch-rubygems.pem\n        source ~/.rvm/scripts/rvm && rvm use 2.6.0 && ruby --version\n        cd /tmp/workspace/dist && gemNameWithVersion=\$(ls *.gem)\n        gem install \$gemNameWithVersion\n        gemName=\$(echo \$gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem\$)//g')\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P MediumSecurity\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P HighSecurity\n    "))
     }
 
     @Test
@@ -40,7 +40,7 @@ class TestPublishToRubyGems extends BuildPipelineTest {
         def gemCommands = getCommands('sh', 'gem')
         assertThat(curlCommands, hasItem(
             "cd /tmp/workspace/test && curl --fail --data-binary @`ls *.gem` -H 'Authorization:API_KEY' -H 'Content-Type: application/octet-stream' https://rubygems.org/api/v1/gems".toString()))
-        assertThat(gemCommands, hasItem("#!/bin/bash\n        gem cert --add /tmp/workspace/certificate/path\n        source /usr/share/opensearch/.rvm/scripts/rvm && rvm use jruby-9.3.0.0 && ruby --version\n        cd /tmp/workspace/test && gemNameWithVersion=\$(ls *.gem)\n        gem install \$gemNameWithVersion\n        gemName=\$(echo \$gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem\$)//g')\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P MediumSecurity\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P HighSecurity\n    "))
+        assertThat(gemCommands, hasItem("#!/bin/bash\n        gem cert --add /tmp/workspace/certificate/path\n        source ~/.rvm/scripts/rvm && rvm use jruby-9.3.0.0 && ruby --version\n        cd /tmp/workspace/test && gemNameWithVersion=\$(ls *.gem)\n        gem install \$gemNameWithVersion\n        gemName=\$(echo \$gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem\$)//g')\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P MediumSecurity\n        gem uninstall \$gemName\n        gem install \$gemNameWithVersion -P HighSecurity\n    "))
     }
 
     def getCommands(method, text) {

diff --git a/tests/jenkins/jobs/PublishToRubyGemWithArgs_Jenkinsfile.txt b/tests/jenkins/jobs/PublishToRubyGemWithArgs_Jenkinsfile.txt
@@ -6,7 +6,7 @@
                PublishToRubyGemWithArgs_Jenkinsfile.publishToRubyGems({apiKeyCredentialId=ruby-api-key, gemsDir=test, publicCertPath=certificate/path, rubyVersion=jruby-9.3.0.0})
                   publishToRubyGems.sh(#!/bin/bash
         gem cert --add /tmp/workspace/certificate/path
-        source /usr/share/opensearch/.rvm/scripts/rvm && rvm use jruby-9.3.0.0 && ruby --version
+        source ~/.rvm/scripts/rvm && rvm use jruby-9.3.0.0 && ruby --version
         cd /tmp/workspace/test && gemNameWithVersion=$(ls *.gem)
         gem install $gemNameWithVersion
         gemName=$(echo $gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem$)//g')

diff --git a/tests/jenkins/jobs/PublishToRubyGems_JenkinsFile.txt b/tests/jenkins/jobs/PublishToRubyGems_JenkinsFile.txt
@@ -6,7 +6,7 @@
                PublishToRubyGems_JenkinsFile.publishToRubyGems({apiKeyCredentialId=ruby-api-key})
                   publishToRubyGems.sh(#!/bin/bash
         gem cert --add /tmp/workspace/certs/opensearch-rubygems.pem
-        source /usr/share/opensearch/.rvm/scripts/rvm && rvm use 2.6.0 && ruby --version
+        source ~/.rvm/scripts/rvm && rvm use 2.6.0 && ruby --version
         cd /tmp/workspace/dist && gemNameWithVersion=$(ls *.gem)
         gem install $gemNameWithVersion
         gemName=$(echo $gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem$)//g')

diff --git a/vars/publishToRubyGems.groovy b/vars/publishToRubyGems.groovy
@@ -24,7 +24,7 @@ void call(Map args = [:]) {
 
     sh """#!/bin/bash
         gem cert --add ${certPath}
-        source /usr/share/opensearch/.rvm/scripts/rvm && rvm use ${rubyVersion} && ruby --version
+        source ~/.rvm/scripts/rvm && rvm use ${rubyVersion} && ruby --version
         cd ${releaseArtifactsDir} && gemNameWithVersion=\$(ls *.gem)
         gem install \$gemNameWithVersion
         gemName=\$(echo \$gemNameWithVersion | sed -E 's/(-[0-9.]+-*[a-z]*.gem\$)//g')