Skip to content

Commit 201f7da

Browse files
authored
chore: neutral naming for synthetics (#444)
1 parent f16e797 commit 201f7da

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

.ci/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pipeline {
3232
}
3333
parameters {
3434
booleanParam(name: 'run_all_stages', defaultValue: false, description: 'Force to run all stages.')
35-
booleanParam(name: 'release', defaultValue: false, description: 'Release. If so, all the other parameters will be ignored when releasing from master.')
35+
booleanParam(name: 'release', defaultValue: false, description: 'Release. If so, all the other parameters will be ignored when releasing from main.')
3636
}
3737
stages {
3838
/**
@@ -157,7 +157,7 @@ pipeline {
157157
when {
158158
beforeAgent true
159159
allOf {
160-
branch 'master'
160+
branch 'main'
161161
expression { return params.release }
162162
}
163163
}

.ci/jobs/e2e-synthetics-mbp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
discover-pr-origin: 'merge-current'
1414
discover-tags: false
1515
disable-pr-notifications: true
16-
head-filter-regex: '(master|\d+\.\d+\.\d+|PR-.*)'
16+
head-filter-regex: '(main|\d+\.\d+\.\d+|PR-.*)'
1717
notification-context: 'elastic-synthetics'
1818
repo: 'synthetics'
1919
repo-owner: 'elastic'

.ci/jobs/e2e-synthetics-schedule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
parameters:
88
- string:
99
name: branch_specifier
10-
default: master
10+
default: main
1111
description: the Git branch specifier to build
1212
pipeline-scm:
1313
script-path: .ci/schedule.groovy

.ci/jobs/synthetic-monitoring.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
discover-pr-forks-trust: permission
1313
discover-pr-origin: merge-current
1414
discover-tags: true
15-
head-filter-regex: '(master|\d+\.\d+\.\d+|PR-.*|v\d+\.\d+\.\d+)'
15+
head-filter-regex: '(main|\d+\.\d+\.\d+|PR-.*|v\d+\.\d+\.\d+)'
1616
notification-context: 'elastic-synthetics'
1717
repo: synthetics
1818
repo-owner: elastic

.ci/schedule.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pipeline {
2222
stages {
2323
stage('Run Tasks'){
2424
steps {
25-
build(job: 'apm-agent-rum/e2e-synthetics-mbp/master',
25+
build(job: 'apm-agent-rum/e2e-synthetics-mbp/main',
2626
propagate: false,
2727
wait: false
2828
)

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Once your changes are ready to submit for review:
3838
3. Rebase your changes
3939

4040
Update your local repository with the most recent code from the main repo,
41-
and rebase your branch on top of the latest master branch. We prefer your
41+
and rebase your branch on top of the latest main branch. We prefer your
4242
initial changes to be squashed into a single commit. Later, if we ask you to
4343
make changes, add them as separate commits. This makes it easier to review.
4444
As a final step before merging, we will either ask you to squash all commits
@@ -60,14 +60,14 @@ Once your changes are ready to submit for review:
6060

6161
### Workflow
6262

63-
All feature development and most bug fixes hit the master branch first.
63+
All feature development and most bug fixes hit the main branch first.
6464
Pull requests should be reviewed by someone with commit access. Once approved,
6565
the author of the pull request, or reviewer if the author does not have commit
6666
access, should "Squash and merge".
6767

6868
Before submitting a pull request, please make sure to follow the below steps
6969

70-
1. Fork the repo and create your branch from `master`.
70+
1. Fork the repo and create your branch from `main`.
7171

7272
2. We use `npm` for running development scripts.
7373

@@ -146,19 +146,19 @@ We run end to end tests for the Synthetics agent itself, as well as the Elastic
146146

147147
If you have access to publish the package to NPM, the process is as follows:
148148

149-
1. Be sure you have checked out the `master` branch and have pulled the latest changes
149+
1. Be sure you have checked out the `main` branch and have pulled the latest changes
150150
1. Run the tests to make sure everything is green
151151
1. Bump the beta version by running `npm version prerelease --preid=beta`
152-
1. Push commits and tags upstream with `git push upstream master && git push upstream --tags`
152+
1. Push commits and tags upstream with `git push upstream main && git push upstream --tags`
153153
1. Publish to NPM using with `npm publish --tag beta`
154154
1. Mark the last published beta tags as latest using `npm dist-tag add @elastic/synthetics@<$VERSION> latest`
155155

156156
#### CI based
157157

158-
The release process is also automated in the way any specific commit from the master branch can be potentially released, for such it's required the below steps:
158+
The release process is also automated in the way any specific commit from the main branch can be potentially released, for such it's required the below steps:
159159

160160
1. Login to apm-ci.elastic.co
161-
1. Go to the [master](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/master/) pipeline.
161+
1. Go to the [main](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/main/) pipeline.
162162
1. Click on `Build with parameters` with the below checkbox:
163163

164164
- `release` to be selected.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/master/badge/icon)](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/master/)
1+
[![Build Status](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/main/badge/icon)](https://apm-ci.elastic.co/job/apm-agent-rum/job/elastic-synthetics/job/main/)
22

33
# Experimental Synthetics Agent
44

__tests__/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ nvm use
1616
```
1717

1818
### Go
19-
We depend on Go to install Elastic Package. The go version depdendency is documented by Elastic Package: https://github.com/elastic/elastic-package/blob/master/.go-version
19+
We depend on Go to install Elastic Package. The go version depdendency is documented by Elastic Package: https://github.com/elastic/elastic-package/blob/main/.go-version
2020

2121

2222
### Elastic Package

0 commit comments

Comments
 (0)