Skip to content

Commit 1cbf0f9

Browse files
tonyredondotonyredondo
authored
[CI Visibility] Update CI specs (#4565)
1 parent 0cac875 commit 1cbf0f9

File tree

13 files changed

+1052
-998
lines changed

13 files changed

+1052
-998
lines changed

‎tracer/src/Datadog.Trace/Ci/CIEnvironmentValues.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,11 @@ private void SetupBitbucketEnvironment()
868868
IsCI = true;
869869
Provider = "bitbucket";
870870
Repository = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketGitSshOrigin);
871+
if (string.IsNullOrEmpty(Repository))
872+
{
873+
Repository = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketGitHttpsOrigin);
874+
}
875+
871876
Commit = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketCommit);
872877
Branch = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketBranch);
873878
Tag = EnvironmentHelpers.GetEnvironmentVariable(Constants.BitBucketTag);
@@ -1238,6 +1243,7 @@ internal sealed class Constants
12381243
// BitBucket CI Environment variables
12391244
public const string BitBucketCommit = "BITBUCKET_COMMIT";
12401245
public const string BitBucketGitSshOrigin = "BITBUCKET_GIT_SSH_ORIGIN";
1246+
public const string BitBucketGitHttpsOrigin = "BITBUCKET_GIT_HTTP_ORIGIN";
12411247
public const string BitBucketBranch = "BITBUCKET_BRANCH";
12421248
public const string BitBucketTag = "BITBUCKET_TAG";
12431249
public const string BitBucketCloneDir = "BITBUCKET_CLONE_DIR";

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/Data/appveyor.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"APPVEYOR_BUILD_ID": "appveyor-build-id",
77
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
88
"APPVEYOR_REPO_BRANCH": "master",
9-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
9+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
1010
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
1111
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
1212
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -26,7 +26,7 @@
2626
"git.commit.author.email": "[email protected]",
2727
"git.commit.author.name": "appveyor-commit-author-name",
2828
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
29-
"git.commit.sha": "appveyor-repo-commit",
29+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
3030
"git.repository_url": "https://github.com/appveyor-repo-name.git"
3131
}
3232
],
@@ -37,7 +37,7 @@
3737
"APPVEYOR_BUILD_ID": "appveyor-build-id",
3838
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
3939
"APPVEYOR_REPO_BRANCH": "master",
40-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
40+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
4141
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
4242
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
4343
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -57,7 +57,7 @@
5757
"git.commit.author.email": "[email protected]",
5858
"git.commit.author.name": "appveyor-commit-author-name",
5959
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
60-
"git.commit.sha": "appveyor-repo-commit",
60+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
6161
"git.repository_url": "https://github.com/appveyor-repo-name.git"
6262
}
6363
],
@@ -68,7 +68,7 @@
6868
"APPVEYOR_BUILD_ID": "appveyor-build-id",
6969
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
7070
"APPVEYOR_REPO_BRANCH": "master",
71-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
71+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
7272
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
7373
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
7474
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -88,7 +88,7 @@
8888
"git.commit.author.email": "[email protected]",
8989
"git.commit.author.name": "appveyor-commit-author-name",
9090
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
91-
"git.commit.sha": "appveyor-repo-commit",
91+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
9292
"git.repository_url": "https://github.com/appveyor-repo-name.git"
9393
}
9494
],
@@ -99,7 +99,7 @@
9999
"APPVEYOR_BUILD_ID": "appveyor-build-id",
100100
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
101101
"APPVEYOR_REPO_BRANCH": "master",
102-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
102+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
103103
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
104104
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
105105
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -119,7 +119,7 @@
119119
"git.commit.author.email": "[email protected]",
120120
"git.commit.author.name": "appveyor-commit-author-name",
121121
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
122-
"git.commit.sha": "appveyor-repo-commit",
122+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
123123
"git.repository_url": "https://github.com/appveyor-repo-name.git"
124124
}
125125
],
@@ -130,7 +130,7 @@
130130
"APPVEYOR_BUILD_ID": "appveyor-build-id",
131131
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
132132
"APPVEYOR_REPO_BRANCH": "master",
133-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
133+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
134134
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
135135
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
136136
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -152,7 +152,7 @@
152152
"git.commit.author.email": "[email protected]",
153153
"git.commit.author.name": "appveyor-commit-author-name",
154154
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
155-
"git.commit.sha": "appveyor-repo-commit",
155+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
156156
"git.repository_url": "https://github.com/appveyor-repo-name.git"
157157
}
158158
],
@@ -163,7 +163,7 @@
163163
"APPVEYOR_BUILD_ID": "appveyor-build-id",
164164
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
165165
"APPVEYOR_REPO_BRANCH": "master",
166-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
166+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
167167
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
168168
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
169169
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -183,7 +183,7 @@
183183
"git.commit.author.email": "[email protected]",
184184
"git.commit.author.name": "appveyor-commit-author-name",
185185
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
186-
"git.commit.sha": "appveyor-repo-commit",
186+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
187187
"git.repository_url": "https://github.com/appveyor-repo-name.git"
188188
}
189189
],
@@ -194,7 +194,7 @@
194194
"APPVEYOR_BUILD_ID": "appveyor-build-id",
195195
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
196196
"APPVEYOR_REPO_BRANCH": "master",
197-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
197+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
198198
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
199199
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
200200
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -216,7 +216,7 @@
216216
"git.commit.author.email": "[email protected]",
217217
"git.commit.author.name": "appveyor-commit-author-name",
218218
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
219-
"git.commit.sha": "appveyor-repo-commit",
219+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
220220
"git.repository_url": "https://github.com/appveyor-repo-name.git"
221221
}
222222
],
@@ -227,7 +227,7 @@
227227
"APPVEYOR_BUILD_ID": "appveyor-build-id",
228228
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
229229
"APPVEYOR_REPO_BRANCH": "master",
230-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
230+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
231231
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
232232
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
233233
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -254,7 +254,7 @@
254254
"APPVEYOR_BUILD_ID": "appveyor-build-id",
255255
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
256256
"APPVEYOR_REPO_BRANCH": "origin/master",
257-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
257+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
258258
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
259259
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
260260
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -274,7 +274,7 @@
274274
"git.commit.author.email": "[email protected]",
275275
"git.commit.author.name": "appveyor-commit-author-name",
276276
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
277-
"git.commit.sha": "appveyor-repo-commit",
277+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
278278
"git.repository_url": "https://github.com/appveyor-repo-name.git"
279279
}
280280
],
@@ -285,7 +285,7 @@
285285
"APPVEYOR_BUILD_ID": "appveyor-build-id",
286286
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
287287
"APPVEYOR_REPO_BRANCH": "refs/heads/master",
288-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
288+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
289289
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
290290
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
291291
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -305,7 +305,7 @@
305305
"git.commit.author.email": "[email protected]",
306306
"git.commit.author.name": "appveyor-commit-author-name",
307307
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
308-
"git.commit.sha": "appveyor-repo-commit",
308+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
309309
"git.repository_url": "https://github.com/appveyor-repo-name.git"
310310
}
311311
],
@@ -316,7 +316,7 @@
316316
"APPVEYOR_BUILD_ID": "appveyor-build-id",
317317
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
318318
"APPVEYOR_REPO_BRANCH": "refs/heads/feature/one",
319-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
319+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
320320
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
321321
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
322322
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -336,7 +336,7 @@
336336
"git.commit.author.email": "[email protected]",
337337
"git.commit.author.name": "appveyor-commit-author-name",
338338
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
339-
"git.commit.sha": "appveyor-repo-commit",
339+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
340340
"git.repository_url": "https://github.com/appveyor-repo-name.git"
341341
}
342342
],
@@ -348,7 +348,7 @@
348348
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
349349
"APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH": "origin/pr",
350350
"APPVEYOR_REPO_BRANCH": "origin/master",
351-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
351+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
352352
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
353353
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
354354
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -368,7 +368,7 @@
368368
"git.commit.author.email": "[email protected]",
369369
"git.commit.author.name": "appveyor-commit-author-name",
370370
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
371-
"git.commit.sha": "appveyor-repo-commit",
371+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
372372
"git.repository_url": "https://github.com/appveyor-repo-name.git"
373373
}
374374
],
@@ -380,7 +380,7 @@
380380
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
381381
"APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH": "refs/heads/pr",
382382
"APPVEYOR_REPO_BRANCH": "refs/heads/master",
383-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
383+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
384384
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
385385
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
386386
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -400,7 +400,7 @@
400400
"git.commit.author.email": "[email protected]",
401401
"git.commit.author.name": "appveyor-commit-author-name",
402402
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
403-
"git.commit.sha": "appveyor-repo-commit",
403+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
404404
"git.repository_url": "https://github.com/appveyor-repo-name.git"
405405
}
406406
],
@@ -411,7 +411,7 @@
411411
"APPVEYOR_BUILD_ID": "appveyor-build-id",
412412
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
413413
"APPVEYOR_REPO_BRANCH": "origin/master",
414-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
414+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
415415
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
416416
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
417417
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -432,7 +432,7 @@
432432
"git.commit.author.email": "[email protected]",
433433
"git.commit.author.name": "appveyor-commit-author-name",
434434
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
435-
"git.commit.sha": "appveyor-repo-commit",
435+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
436436
"git.repository_url": "https://github.com/appveyor-repo-name.git",
437437
"git.tag": "0.1.0"
438438
}
@@ -444,7 +444,7 @@
444444
"APPVEYOR_BUILD_ID": "appveyor-build-id",
445445
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
446446
"APPVEYOR_REPO_BRANCH": "refs/heads/master",
447-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
447+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
448448
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
449449
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
450450
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -465,7 +465,7 @@
465465
"git.commit.author.email": "[email protected]",
466466
"git.commit.author.name": "appveyor-commit-author-name",
467467
"git.commit.message": "appveyor-commit-message\nappveyor-commit-message-extended",
468-
"git.commit.sha": "appveyor-repo-commit",
468+
"git.commit.sha": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
469469
"git.repository_url": "https://github.com/appveyor-repo-name.git",
470470
"git.tag": "0.1.0"
471471
}
@@ -475,7 +475,7 @@
475475
"APPVEYOR": "true",
476476
"APPVEYOR_BUILD_ID": "appveyor-build-id",
477477
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
478-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
478+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
479479
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
480480
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
481481
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",
@@ -516,7 +516,7 @@
516516
"APPVEYOR": "true",
517517
"APPVEYOR_BUILD_ID": "appveyor-build-id",
518518
"APPVEYOR_BUILD_NUMBER": "appveyor-pipeline-number",
519-
"APPVEYOR_REPO_COMMIT": "appveyor-repo-commit",
519+
"APPVEYOR_REPO_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
520520
"APPVEYOR_REPO_COMMIT_AUTHOR": "appveyor-commit-author-name",
521521
"APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL": "[email protected]",
522522
"APPVEYOR_REPO_COMMIT_MESSAGE": "appveyor-commit-message",

0 commit comments

Comments
 (0)