Skip to content

Commit

Permalink
[CI Visibility] Update CI specs (#4565)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonyredondo
tonyredondo authored Aug 30, 2023
1 parent 0cac875 commit 1cbf0f9
Show file tree
Hide file tree
Showing 13 changed files with 1,052 additions and 998 deletions.
6 changes: 6 additions & 0 deletions tracer/src/Datadog.Trace/Ci/CIEnvironmentValues.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,11 @@ private void SetupBitbucketEnvironment()
IsCI = true;
Provider = "bitbucket";
Repository = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketGitSshOrigin);
if (string.IsNullOrEmpty(Repository))
{
Repository = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketGitHttpsOrigin);
}

Commit = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketCommit);
Branch = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketBranch);
Tag = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketTag);
Expand Down Expand Up @@ -1238,6 +1243,7 @@ internal sealed class Constants
// BitBucket CI Environment variables
public const string BitBucketCommit = "BITBUCKET_COMMIT";
public const string BitBucketGitSshOrigin = "BITBUCKET_GIT_SSH_ORIGIN";
public const string BitBucketGitHttpsOrigin = "BITBUCKET_GIT_HTTP_ORIGIN";
public const string BitBucketBranch = "BITBUCKET_BRANCH";
public const string BitBucketTag = "BITBUCKET_TAG";
public const string BitBucketCloneDir = "BITBUCKET_CLONE_DIR";
Expand Down
62 changes: 31 additions & 31 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/Data/appveyor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -26,7 +26,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -37,7 +37,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -57,7 +57,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -68,7 +68,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -88,7 +88,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -99,7 +99,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -119,7 +119,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -130,7 +130,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -152,7 +152,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -163,7 +163,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -183,7 +183,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -194,7 +194,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -216,7 +216,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -227,7 +227,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -254,7 +254,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "origin/master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -274,7 +274,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -285,7 +285,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "refs/heads/master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -305,7 +305,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -316,7 +316,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "refs/heads/feature/one",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -336,7 +336,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -348,7 +348,7 @@
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH": "origin/pr",
"APPVEYOR_REPO_BRANCH": "origin/master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -368,7 +368,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -380,7 +380,7 @@
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH": "refs/heads/pr",
"APPVEYOR_REPO_BRANCH": "refs/heads/master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -400,7 +400,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git"
}
],
Expand All @@ -411,7 +411,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "origin/master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -432,7 +432,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git",
"git.tag": "0.1.0"
}
Expand All @@ -444,7 +444,7 @@
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_BRANCH": "refs/heads/master",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand All @@ -465,7 +465,7 @@
"git.commit.author.email": "[email protected]",
"git.commit.author.name": "appveyor-commit-author-name",
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
"git.commit.sha": "appveyor-repo-commit",
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"git.repository_url": "https://github.com/appveyor-repo-name.git",
"git.tag": "0.1.0"
}
Expand All @@ -475,7 +475,7 @@
"APPVEYOR": "true",
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand Down Expand Up @@ -516,7 +516,7 @@
"APPVEYOR": "true",
"APPVEYOR_BUILD_ID": "appveyor-build-id",
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
Expand Down
Loading

0 comments on commit 1cbf0f9

Please sign in to comment.