diff --git a/ansible/roles/awx/tasks/main.yml b/ansible/roles/awx/tasks/main.yml index f376c3ac3..1fc1d81de 100644 --- a/ansible/roles/awx/tasks/main.yml +++ b/ansible/roles/awx/tasks/main.yml @@ -102,7 +102,7 @@ command: tower-cli team create --name {{ awx_org }} --organization {{ awx_org }} - name: add nodejs/build repo to AWX - command: tower-cli project create --organization {{ awx_org }} --name nodejs/build --scm-type git --scm-url https://github.com/nodejs/build --scm-branch master --scm-update-on-launch true + command: tower-cli project create --organization {{ awx_org }} --name nodejs/build --scm-type git --scm-url https://github.com/nodejs/build --scm-branch main --scm-update-on-launch true - name: create inventory command: tower-cli inventory create --organization {{ awx_org }} --name nodejs_inventory_github diff --git a/doc/node-test-commit-matrix.md b/doc/node-test-commit-matrix.md index c95d6928c..f27e08239 100644 --- a/doc/node-test-commit-matrix.md +++ b/doc/node-test-commit-matrix.md @@ -150,7 +150,7 @@ The following combinations are used: - Machines for "Test Only" don't build Node.js, but are still used to build add-ons so Visual Studio is necessary. - Machines in Rackspace have more capacity, so avoid building on Azure, at least the current Node.js version. -- Optimize resources for the current Node.js master. +- Optimize resources for the current Node.js main. - Ensure Node.js LTS versions have full coverage, even if with possible bottlenecks in certain versions. ### Jenkins Labels diff --git a/jenkins/pipelines/http-parser-test.jenkinsfile b/jenkins/pipelines/http-parser-test.jenkinsfile index 5a45bc98a..80d6abd4c 100644 --- a/jenkins/pipelines/http-parser-test.jenkinsfile +++ b/jenkins/pipelines/http-parser-test.jenkinsfile @@ -8,7 +8,7 @@ pipeline { parameters { booleanParam(name: 'CERTIFY_SAFE', defaultValue: false, description: 'I have reviewed *the latest version of* these changes and I am sure that they don’t contain any code that could compromise the security of the CI infrastructure.') string(name: 'PR_ID', defaultValue: "", description: 'The numeric ID of the pull request (from GitHub URL)') - string(name: 'BRANCH', defaultValue: 'master', description: 'Git branch to use for testing (ignore this value for PRs)') + string(name: 'BRANCH', defaultValue: 'main', description: 'Git branch to use for testing (ignore this value for PRs)') } stages { diff --git a/jenkins/pipelines/llnode-pipeline.jenkinsfile b/jenkins/pipelines/llnode-pipeline.jenkinsfile index b46c733a1..4158b30fc 100644 --- a/jenkins/pipelines/llnode-pipeline.jenkinsfile +++ b/jenkins/pipelines/llnode-pipeline.jenkinsfile @@ -3,7 +3,7 @@ properties([ parameters([ string(name: 'GIT_REPO', defaultValue: 'nodejs/llnode', description: 'Fetch from this repo (e.g. gibfahn/llnode)'), - string(name: 'GIT_BRANCH', defaultValue: 'master', description: 'Branch to test (e.g. master, refs/pull/999/head).'), + string(name: 'GIT_BRANCH', defaultValue: 'main', description: 'Branch to test (e.g. main, refs/pull/999/head).'), string(name: 'NODE_VERSIONS', defaultValue: 'v6 v8 v9 v10 nightly canary', description: 'Space separated list of NODE_VERSIONS to pass to llnode-continuous-integration.'), string(name: 'LLDB_VERSIONS', defaultValue: '3.9 4.0 5.0 6.0', description: 'Space separated list of LLDB_VERSIONS to pass to llnode-continuous-integration.'), string(name: 'MACHINES', defaultValue: 'all', description: '''Can be "all" or a space-separated list of nodes, eg: diff --git a/jenkins/pipelines/node-linter.jenkinsfile b/jenkins/pipelines/node-linter.jenkinsfile index 81f51cb1c..b97d7fc2d 100644 --- a/jenkins/pipelines/node-linter.jenkinsfile +++ b/jenkins/pipelines/node-linter.jenkinsfile @@ -5,7 +5,7 @@ pipeline { parameters{ string(name: 'GITHUB_ORG', defaultValue: 'nodejs', description: 'The user/org of the GitHub repo') string(name: 'REPO_NAME', defaultValue: 'node', description: 'The name of the repo') - string(name: 'GIT_REMOTE_REF', defaultValue: 'refs/heads/master', description: 'The remote portion of the Git refspec to fetch and test') + string(name: 'GIT_REMOTE_REF', defaultValue: 'refs/heads/main', description: 'The remote portion of the Git refspec to fetch and test') } stages { @@ -26,7 +26,7 @@ pipeline { stage('Pre-flight') { steps { - sh "curl -L -s https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-pre.sh -s | bash -xe" + sh "curl -L -s https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-pre.sh -s | bash -xe" sendBuildStatus("pending", env) checkMake() // Make sure we have a node binary in the path diff --git a/jenkins/pipelines/node-test-pull-request-lite-pipeline.jenkinsfile b/jenkins/pipelines/node-test-pull-request-lite-pipeline.jenkinsfile index 36bb212ff..b73d33a95 100644 --- a/jenkins/pipelines/node-test-pull-request-lite-pipeline.jenkinsfile +++ b/jenkins/pipelines/node-test-pull-request-lite-pipeline.jenkinsfile @@ -61,7 +61,7 @@ def getBranchName(params) { if (params.PR_ID) { return "refs/pull/${params.PR_ID}/head" } else { - return "refs/heads/master" + return "refs/heads/main" } } diff --git a/jenkins/scripts/common/getNode.sh b/jenkins/scripts/common/getNode.sh index eda99144b..5f5eb6ec0 100755 --- a/jenkins/scripts/common/getNode.sh +++ b/jenkins/scripts/common/getNode.sh @@ -11,7 +11,7 @@ helpText="Download the node binary for your machine from nodejs.org. ${CYAN}USAGE:${NC} $0 8.9.1 - 8.9.0 $sep Node to download (8.9.0, master, 8, 8.9.0-nightly, latest, 6.2.) + 8.9.0 $sep Node to download (8.9.0, main, 8, 8.9.0-nightly, latest, 6.2.) Inexact values get most recent from range." ################################################################################ diff --git a/jenkins/scripts/coverage/generate-index-html.py b/jenkins/scripts/coverage/generate-index-html.py index 992ec5c90..b3e0db3de 100755 --- a/jenkins/scripts/coverage/generate-index-html.py +++ b/jenkins/scripts/coverage/generate-index-html.py @@ -39,7 +39,7 @@ Nightly combined JavaScript coverage for Windows and Linux can be found on codecov.io: - Combined coverage + Combined coverage

Nightly Linux Branch Coverage  → diff --git a/jenkins/xml/citgm-smoker.xml b/jenkins/xml/citgm-smoker.xml index f3bbb58e1..776ffb76a 100644 --- a/jenkins/xml/citgm-smoker.xml +++ b/jenkins/xml/citgm-smoker.xml @@ -51,13 +51,13 @@ examples: refs/heads/:branch | refs/pull/:pr-number/head - refs/heads/master + refs/heads/main REBASE_ONTO Optionally, rebase onto the given ref before testing. Leave blank to skip rebasing. | examples: -origin/master +origin/main