chore: collect additional ci envs (#29845)

Author: emilyrohrbough

packages/server/lib/util/ci_provider.js

@@ -154,12 +154,20 @@ const _providerCiParams = () => {
       'APPVEYOR_PULL_REQUEST_NUMBER',
       'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
     ]),
+    // https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables
     azure: extract([
       'BUILD_BUILDID',
       'BUILD_BUILDNUMBER',
       'BUILD_CONTAINERID',
       'BUILD_REPOSITORY_URI',
+      'SYSTEM_JOBID',
+      'SYSTEM_STAGEATTEMPT',
+      'SYSTEM_PHASEATTEMPT',
+      'SYSTEM_JOBATTEMPT',
+      'SYSTEM_PLANID',
       'SYSTEM_PULLREQUEST_PULLREQUESTNUMBER',
+      'SYSTEM_PULLREQUEST_TARGETBRANCH',
+      'SYSTEM_PULLREQUEST_TARGETBRANCHNAME',
     ]),
     awsCodeBuild: extract([
       'CODEBUILD_BUILD_ID',
@@ -206,6 +214,8 @@ const _providerCiParams = () => {
       'CIRCLE_PR_USERNAME',
       'CIRCLE_COMPARE_URL',
       'CIRCLE_WORKFLOW_ID',
+      'CIRCLE_WORKFLOW_JOB_ID',
+      'CIRCLE_PIPELINE_ID',
       'CIRCLE_PULL_REQUEST',
       'CIRCLE_REPOSITORY_URL',
       'CI_PULL_REQUEST',
@@ -224,6 +234,8 @@ const _providerCiParams = () => {
       'CI_BUILD_ID',
       'CI_REPO_NAME',
       'CI_PROJECT_ID',
+      'CI_PR_NUMBER',
+      'CI_PULL_REQUEST',
     ]),
     // https://concourse-ci.org/implementing-resource-types.html#resource-metadata
     concourse: extract([
@@ -266,6 +278,7 @@ const _providerCiParams = () => {
       'GITHUB_HEAD_REF',
       'GITHUB_REF_NAME',
       'GITHUB_REF',
+      'GITHUB_JOB',
     ]),
     // see https://docs.gitlab.com/ee/ci/variables/
     gitlab: extract([
@@ -284,7 +297,9 @@ const _providerCiParams = () => {
       'CI_REPOSITORY_URL',
       'CI_ENVIRONMENT_URL',
       'CI_DEFAULT_BRANCH',
-    // for PRs: https://gitlab.com/gitlab-org/gitlab-ce/issues/23902
+      // for PRs: https://gitlab.com/gitlab-org/gitlab-ce/issues/23902
+      'CI_MERGE_REQUEST_SOURCE_BRANCH_NAME',
+      'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA',
     ]),
     // https://docs.gocd.org/current/faq/dev_use_current_revision_in_build.html#standard-gocd-environment-variables
     goCD: extract([
@@ -312,6 +327,9 @@ const _providerCiParams = () => {
       'TAG_NAME',
       'COMMIT_SHA',
       'SHORT_SHA',
+      '_HEAD_BRANCH',
+      '_BASE_BRANCH',
+      '_PR_NUMBER',
       // https://cloud.google.com/cloud-build/docs/api/reference/rest/Shared.Types/Build
     ]),
     /**

packages/server/test/unit/util/ci_provider_spec.js

@@ -353,15 +353,16 @@ describe('lib/util/ci_provider', () => {
   it('circle', () => {
     resetEnv = mockedEnv({
       CIRCLECI: 'true',
-
       CIRCLE_JOB: 'circleJob',
       CIRCLE_BUILD_NUM: 'circleBuildNum',
       CIRCLE_BUILD_URL: 'circleBuildUrl',
       CIRCLE_PR_NUMBER: 'circlePrNumber',
       CIRCLE_PR_REPONAME: 'circlePrReponame',
       CIRCLE_PR_USERNAME: 'circlePrUsername',
       CIRCLE_COMPARE_URL: 'circleCompareUrl',
+      CIRCLE_PIPELINE_ID: 'circlePipelineId',
       CIRCLE_WORKFLOW_ID: 'circleWorkflowId',
+      CIRCLE_WORKFLOW_JOB_ID: 'circleWorkflowJobId',
       CIRCLE_PULL_REQUEST: 'circlePullRequest',
       CIRCLE_REPOSITORY_URL: 'circleRepositoryUrl',
       CI_PULL_REQUEST: 'ciPullRequest',
@@ -380,7 +381,9 @@ describe('lib/util/ci_provider', () => {
       circlePrReponame: 'circlePrReponame',
       circlePrUsername: 'circlePrUsername',
       circleCompareUrl: 'circleCompareUrl',
+      circlePipelineId: 'circlePipelineId',
       circleWorkflowId: 'circleWorkflowId',
+      circleWorkflowJobId: 'circleWorkflowJobId',
       circlePullRequest: 'circlePullRequest',
       circleRepositoryUrl: 'circleRepositoryUrl',
       ciPullRequest: 'ciPullRequest',
@@ -444,13 +447,17 @@ describe('lib/util/ci_provider', () => {
       CI_COMMIT_MESSAGE: 'ciCommitMessage',
       CI_COMMITTER_NAME: 'ciCommitterName',
       CI_COMMITTER_EMAIL: 'ciCommitterEmail',
+      CI_PR_NUMBER: 'prNumber',
+      CI_PULL_REQUEST: 'pullRequest',
     }, { clear: true })
 
     expectsName('codeshipPro')
     expectsCiParams({
       ciBuildId: 'ciBuildId',
       ciRepoName: 'ciRepoName',
       ciProjectId: 'ciProjectId',
+      ciPrNumber: 'prNumber',
+      ciPullRequest: 'pullRequest',
     })
 
     return expectsCommitParams({
@@ -568,6 +575,7 @@ describe('lib/util/ci_provider', () => {
       GITHUB_ACTION: 'ciGitHubActionId',
       GITHUB_EVENT_NAME: 'ciEventName',
       GITHUB_RUN_ID: 'ciGithubRunId',
+      GITHUB_JOB: 'jobName',
       GITHUB_RUN_ATTEMPT: 'ciGithubRunAttempt',
       GITHUB_REPOSITORY: 'ciGithubRepository',
       GITHUB_SHA: 'ciCommitSha',
@@ -586,6 +594,7 @@ describe('lib/util/ci_provider', () => {
       githubRepository: 'ciGithubRepository',
       githubRunAttempt: 'ciGithubRunAttempt',
       githubRunId: 'ciGithubRunId',
+      githubJob: 'jobName',
       githubBaseRef: 'ciBaseRef',
       githubHeadRef: 'ciHeadRef',
       githubRefName: 'ciRefName',
@@ -653,6 +662,8 @@ describe('lib/util/ci_provider', () => {
       CI_COMMIT_MESSAGE: 'ciCommitMessage',
       GITLAB_USER_NAME: 'gitlabUserName',
       GITLAB_USER_EMAIL: 'gitlabUserEmail',
+      CI_MERGE_REQUEST_SOURCE_BRANCH_NAME: 'sourceBranchName',
+      CI_MERGE_REQUEST_SOURCE_BRANCH_SHA: 'sourceBranchSha',
     }, { clear: true })
 
     expectsName('gitlab')
@@ -669,6 +680,8 @@ describe('lib/util/ci_provider', () => {
       ciRepositoryUrl: 'ciRepositoryUrl',
       ciEnvironmentUrl: 'ciEnvironmentUrl',
       ciDefaultBranch: 'ciDefaultBranch',
+      ciMergeRequestSourceBranchName: 'sourceBranchName',
+      ciMergeRequestSourceBranchSha: 'sourceBranchSha',
     })
 
     expectsCommitParams({
@@ -741,6 +754,9 @@ describe('lib/util/ci_provider', () => {
 
       COMMIT_SHA: 'commitSha',
       BRANCH_NAME: 'branchName',
+      _HEAD_BRANCH: 'headBranch',
+      _BASE_BRANCH: 'baseBranch',
+      _PR_NUMBER: 'prNumber',
     }, { clear: true })
 
     expectsName('googleCloud')
@@ -749,6 +765,9 @@ describe('lib/util/ci_provider', () => {
       projectId: 'projectId',
       commitSha: 'commitSha',
       branchName: 'branchName',
+      headBranch: 'headBranch',
+      baseBranch: 'baseBranch',
+      prNumber: 'prNumber',
     })
 
     expectsCommitParams({
@@ -1137,7 +1156,14 @@ describe('lib/util/ci_provider', () => {
       BUILD_BUILDNUMBER: 'buildNumber',
       BUILD_CONTAINERID: 'containerId',
       BUILD_REPOSITORY_URI: 'buildRepositoryUri',
+      SYSTEM_PLANID: 'planId',
       SYSTEM_PULLREQUEST_PULLREQUESTNUMBER: 'systemPullrequestPullrequestnumber',
+      SYSTEM_PULLREQUEST_TARGETBRANCH: 'targetBranch',
+      SYSTEM_PULLREQUEST_TARGETBRANCHNAME: 'targetBranchName',
+      SYSTEM_JOBID: 'jobid',
+      SYSTEM_STAGEATTEMPT: 'stageAttempt',
+      SYSTEM_PHASEATTEMPT: 'phaseAttempt',
+      SYSTEM_JOBATTEMPT: 'jobAttempt',
 
       BUILD_SOURCEVERSION: 'commit',
       BUILD_SOURCEBRANCHNAME: 'branch',
@@ -1152,7 +1178,14 @@ describe('lib/util/ci_provider', () => {
       buildBuildnumber: 'buildNumber',
       buildContainerid: 'containerId',
       buildRepositoryUri: 'buildRepositoryUri',
+      systemPlanid: 'planId',
       systemPullrequestPullrequestnumber: 'systemPullrequestPullrequestnumber',
+      systemPullrequestTargetbranch: 'targetBranch',
+      systemPullrequestTargetbranchname: 'targetBranchName',
+      systemJobid: 'jobid',
+      systemStageattempt: 'stageAttempt',
+      systemPhaseattempt: 'phaseAttempt',
+      systemJobattempt: 'jobAttempt',
     })
 
     return expectsCommitParams({