Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Getting CLI working again #1267

Merged
merged 25 commits into from
Oct 4, 2024
Merged

Getting CLI working again #1267

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a91d536
Update README.md
begonaguereca Sep 24, 2024
beaf0e9
Retrying GetRepoCommitShas
ArinGhazarian Sep 25, 2024
bdab8fa
Create ci-errors.yml
begonaguereca Sep 26, 2024
2498132
Update ci-errors.yml
begonaguereca Sep 26, 2024
df12e64
testin v 2 orgs
begonaguereca Sep 26, 2024
bb13125
Delete .github/workflows/ci-errors.yml
begonaguereca Sep 26, 2024
2e7e141
Updates from editor
begonaguereca Sep 26, 2024
78fcb2e
Was it a naming issue?
begonaguereca Sep 27, 2024
3443df7
test
begonaguereca Sep 27, 2024
fb329cc
typo
begonaguereca Sep 27, 2024
e453132
sleep 60
begonaguereca Sep 30, 2024
4168161
Updates from editor
begonaguereca Oct 1, 2024
aef255b
Fix formatting issue
begonaguereca Oct 1, 2024
f4a9260
Pointing to an EMU we control
begonaguereca Oct 1, 2024
951b0c7
Add pagination
begonaguereca Oct 2, 2024
2d85d53
Update logic
begonaguereca Oct 2, 2024
d4d22e8
update
begonaguereca Oct 2, 2024
12361df
Parse tokens correctly
begonaguereca Oct 2, 2024
9e8d9e4
Fix source repo name
begonaguereca Oct 3, 2024
00d7a71
Update target ADO names
begonaguereca Oct 3, 2024
130e83e
revert
begonaguereca Oct 3, 2024
5ebcc02
Update
begonaguereca Oct 3, 2024
c86c7c6
Add unit tests
begonaguereca Oct 4, 2024
8fd1b58
Clean up
begonaguereca Oct 4, 2024
b77dbf2
merge with Arins branch
begonaguereca Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/OctoshiftCLI.IntegrationTests/BbsToGithub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ public BbsToGithub(ITestOutputHelper output)
public async Task Basic(string bbsServer, bool useSshForArchiveDownload, bool useAzureForArchiveUpload)
{
var bbsProjectKey = $"E2E-{TestHelper.GetOsName().ToUpper()}";
var githubTargetOrg = $"e2e-testing-bbs-{TestHelper.GetOsName()}";
var githubTargetOrg = $"e2e-testing-bbs-{TestHelper.GetOsName()}-2";
var repo1 = $"{bbsProjectKey}-repo-1";
var repo2 = $"{bbsProjectKey}-repo-2";
var targetRepo1 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-1";
var targetRepo2 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-2";

var sourceBbsApi = new BbsApi(_sourceBbsClient, bbsServer, _logger);
var sourceHelper = new TestHelper(_output, sourceBbsApi, _sourceBbsClient, bbsServer);
Expand All @@ -87,10 +89,10 @@ await retryPolicy.Retry(async () =>
await _targetHelper.ResetGithubTestEnvironment(githubTargetOrg);

await sourceHelper.CreateBbsProject(bbsProjectKey);
await sourceHelper.CreateBbsRepo(bbsProjectKey, "repo-1");
await sourceHelper.InitializeBbsRepo(bbsProjectKey, "repo-1");
await sourceHelper.CreateBbsRepo(bbsProjectKey, "repo-2");
await sourceHelper.InitializeBbsRepo(bbsProjectKey, "repo-2");
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo1);
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo1);
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo2);
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo2);
ArinGhazarian marked this conversation as resolved.
Show resolved Hide resolved
});

var archiveDownloadOptions = $" --ssh-user octoshift --ssh-private-key {SSH_KEY_FILE}";
Expand Down Expand Up @@ -123,10 +125,10 @@ await _targetHelper.RunBbsCliMigration(

_targetHelper.AssertNoErrorInLogs(_startTime);

await _targetHelper.AssertGithubRepoExists(githubTargetOrg, repo1);
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, repo2);
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, repo1);
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, repo2);
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo1);
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo2);
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo1);
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo2);

// TODO: Assert migration logs are downloaded
}
Expand Down
4 changes: 3 additions & 1 deletion src/OctoshiftCLI.IntegrationTests/TestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,10 @@ private async Task CreateRepo(string org, string repo, bool isPrivate, bool isIn

private async Task<IEnumerable<string>> GetRepoCommitShas(string org, string repo)
{
var retryPolicy = new RetryPolicy(null);

var url = $"{GithubApiBaseUrl}/repos/{org}/{repo}/commits";
var commits = await _githubClient.GetAllAsync(url).ToListAsync();
var commits = await retryPolicy.Retry(async () => await _githubClient.GetAllAsync(url).ToListAsync());
return commits.Select(x => (string)x["sha"]).ToList();
}

Expand Down
Loading