Merge branch 'master' of github.com:elastic/apm-pipeline-library

* 'master' of github.com:elastic/apm-pipeline-library:
  fix: use toJSON instead readJSON (#1071)
  test-infra: add curl validation on windows (#1069)
  CI: skip using ubuntu label in the beats test-infra (#1070)

.ci/validateWorkersBeatsCi.groovy

@@ -71,7 +71,6 @@ pipeline {
               'immutable && windows-2008-r2',
               'immutable && windows-7-32-bit',
               'immutable && windows-7',
-              'ubuntu && immutable',
               'ubuntu-18',
               'ubuntu-20',
               'worker-c07c6107jyw0',  // macOS workers https://beats-ci.elastic.co/label/macosx/

src/test/groovy/ApmCliStepTests.groovy

@@ -86,11 +86,8 @@ class ApmCliStepTests extends ApmBasePipelineTest {
   @Test
   void testVaultConfig() throws Exception {
     helper.registerAllowedMethod('getVaultSecret', [Map.class],
-      { return [
-          "data": [
-            "value": '{"url": "https://vaultapm.example.com:8200", "token": "vaultApmPassword"}'
-            ]
-          ]
+      {
+        return [data: [value: '{"url": "https://vaultapm.example.com:8200", "token": "vaultApmPassword"}' ]]
     })
 
     script.call(apmCliConfig: "secret/oblt/apm", serviceName: "serviceFoo")

test-infra/beats-ci/test_beats_windows.py

@@ -11,3 +11,7 @@ def test_python_installed(host):
 def test_tar_installed(host):
   cmd = host.run("tar --version")
   assert cmd.rc == 0, "it is required for the stashV2 and unstashV2 steps"
+
+def test_curl_installed(host):
+  cmd = host.run("curl --version")
+  assert cmd.rc == 0, "it is required for the Beats projects"

vars/apmCli.groovy

@@ -53,7 +53,7 @@ def call(Map args = [:]) {
 
     if(!url && !token){
       def apmJson = getVaultSecret(secret: "${apmCliConfig}")?.data.value
-      def apm = readJSON(text: apmJson)
+      def apm = toJSON(apmJson)
       url = apm.url
       token = apm.token
     }