Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

Commit

Permalink
ARM workers are now ephemeral
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v committed Mar 30, 2021
1 parent b220d98 commit a8b5e70
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/test/groovy/IsStaticWorkerStepTests.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class IsStaticWorkerStepTests extends ApmBasePipelineTest {

@Test
void test_with_static_worker() throws Exception {
assertTrue(script.call(labels: 'arm'))
assertTrue(script.call(labels: 'macosx'))
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions vars/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ Whether the existing worker is a static one
}
```

TODO: as soon as ARM and MacOS are ephemerals then we need to change this method
TODO: as soon as macOS workers are ephemerals then we need to change this method

## isTag
Whether the build is based on a Tag Request or no
Expand Down Expand Up @@ -1759,7 +1759,7 @@ pipeline {
}
```

* *es_secret:* Vault secret with the details to access to Elasticsearch, this parameter is mandatory ({user: 'foo', password: 'myFoo', url: 'http://foo.example.com'})
* *es_secret:* Vault secrets with the details to access to Elasticsearch, this parameter is mandatory ({user: 'foo', password: 'myFoo', url: 'http://foo.example.com'})
* *config:* metricbeat configuration file, a default configuration is created if the file does not exists (metricbeat_conf.yml).
* *image:* metricbeat Docker image to use (docker.elastic.co/beats/metricbeat:7.10.1).
* *timeout:* Time to wait before kill the metricbeat Docker container on the stop operation.
Expand Down
2 changes: 1 addition & 1 deletion vars/isStaticWorker.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
*/
def call(Map args=[:]){
def labels = args.containsKey('labels') ? args.labels : error("isStaticWorker: labels parameter is required.")
return (labels?.contains('arm') || labels?.contains('macosx') || labels?.contains('metal'))
return (labels?.contains('macosx') || labels?.contains('metal'))
}
2 changes: 1 addition & 1 deletion vars/isStaticWorker.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Whether the existing worker is a static one
}
```

TODO: as soon as ARM and MacOS are ephemerals then we need to change this method
TODO: as soon as macOS workers are ephemerals then we need to change this method

0 comments on commit a8b5e70

Please sign in to comment.