Merge pull request #33 from CIAT-DAPA/develop

jchemutt · web-flow · commit 3583af8da8a5 · 2025-12-04T15:09:35.000+03:00
Develop
diff --git a/JenkinsFile b/JenkinsFile
@@ -9,6 +9,7 @@ pipeline {
         server_host = credentials('host_spcat')
         ssh_key = credentials('spcat_key')
         port_api = credentials('api_spcat_port')
+        GOOGLE_API_KEY = credentials('google_api_key_spcat')
     }
 
     stages {
@@ -93,8 +94,8 @@ pipeline {
                 script {
                     sshCommand remote: remote, command: '''
                         # setup the key
-                        api_google=$(grep -oP "(?<=API_GOOGLE_KEY=).+" ./variables_webapp.txt)
-                        sed -i "s/keyhere/$api_google/g" ./webapp_SPCAT/build/index.html
+                        api_google='${env.GOOGLE_API_KEY}'
+                        sed -i \"s/keyhere/\$api_google/g\" ./webapp_SPCAT/build/index.html
                     '''
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ pipeline {`
`9`	`9`	`server_host = credentials('host_spcat')`
`10`	`10`	`ssh_key = credentials('spcat_key')`
`11`	`11`	`port_api = credentials('api_spcat_port')`
	`12`	`+ GOOGLE_API_KEY = credentials('google_api_key_spcat')`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`stages {`
`@@ -93,8 +94,8 @@ pipeline {`
`93`	`94`	`script {`
`94`	`95`	`sshCommand remote: remote, command: '''`
`95`	`96`	`# setup the key`
`96`		`- api_google=$(grep -oP "(?<=API_GOOGLE_KEY=).+" ./variables_webapp.txt)`
`97`		`- sed -i "s/keyhere/$api_google/g" ./webapp_SPCAT/build/index.html`
	`97`	`+ api_google='${env.GOOGLE_API_KEY}'`
	`98`	`+ sed -i \"s/keyhere/\$api_google/g\" ./webapp_SPCAT/build/index.html`
`98`	`99`	`'''`
`99`	`100`	`}`
`100`	`101`	`}`