Skip to content

Commit 3d61641

Browse files
brianajbrianaj
committed
only migrate one repo
1 parent 36d99c5 commit 3d61641

File tree

4 files changed

+0
-49
lines changed

4 files changed

+0
-49
lines changed

‎src/OctoshiftCLI.IntegrationTests/BbsAwsLinuxToGithub.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ public async Task MigrateRepo_BbsLinux_AwsS3()
7373
var bbsProjectKey = $"E2E-{TestHelper.GetOsName().ToUpper()}";
7474
var githubTargetOrg = $"octoshift-e2e-bbs-{TestHelper.GetOsName()}";
7575
var repo1 = $"{bbsProjectKey}-repo-1";
76-
var repo2 = $"{bbsProjectKey}-repo-2";
7776
var targetRepo1 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-1";
78-
var targetRepo2 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-2";
7977

8078
var sourceBbsApi = new BbsApi(_sourceBbsClient, bbsServer, _logger);
8179
var sourceHelper = new TestHelper(_output, sourceBbsApi, _sourceBbsClient, bbsServer);
@@ -91,8 +89,6 @@ await retryPolicy.Retry(async () =>
9189
await sourceHelper.CreateBbsProject(bbsProjectKey);
9290
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo1);
9391
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo1);
94-
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo2);
95-
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo2);
9692
});
9793

9894
// Use SSH for archive download
@@ -113,14 +109,6 @@ await _targetHelper.RunBbsCliMigration(
113109

114110
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo1);
115111
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo1);
116-
117-
await _targetHelper.RunBbsCliMigration(
118-
$"migrate-repo --github-org {githubTargetOrg} --bbs-server-url {bbsServer} --bbs-project {bbsProjectKey} --bbs-repo {repo2} --github-repo {targetRepo2}{archiveDownloadOptions}{awsOptions}", _tokens);
119-
120-
_targetHelper.AssertNoErrorInLogs(_startTime);
121-
122-
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo2);
123-
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo2);
124112
}
125113

126114
public void Dispose()

‎src/OctoshiftCLI.IntegrationTests/BbsAzureLinuxToGithub.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ public async Task MigrateRepo_BbsLinux_AzureStorage()
7272
var bbsProjectKey = $"E2E-{TestHelper.GetOsName().ToUpper()}";
7373
var githubTargetOrg = $"octoshift-e2e-bbs-{TestHelper.GetOsName()}";
7474
var repo1 = $"{bbsProjectKey}-repo-1";
75-
var repo2 = $"{bbsProjectKey}-repo-2";
7675
var targetRepo1 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-1";
77-
var targetRepo2 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-2";
7876

7977
var sourceBbsApi = new BbsApi(_sourceBbsClient, bbsServer, _logger);
8078
var sourceHelper = new TestHelper(_output, sourceBbsApi, _sourceBbsClient, bbsServer);
@@ -90,8 +88,6 @@ await retryPolicy.Retry(async () =>
9088
await sourceHelper.CreateBbsProject(bbsProjectKey);
9189
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo1);
9290
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo1);
93-
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo2);
94-
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo2);
9591
});
9692

9793
// Use SSH for archive download
@@ -109,14 +105,6 @@ await _targetHelper.RunBbsCliMigration(
109105

110106
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo1);
111107
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo1);
112-
113-
await _targetHelper.RunBbsCliMigration(
114-
$"migrate-repo --github-org {githubTargetOrg} --bbs-server-url {bbsServer} --bbs-project {bbsProjectKey} --bbs-repo {repo2} --github-repo {targetRepo2}{archiveDownloadOptions}", _tokens);
115-
116-
_targetHelper.AssertNoErrorInLogs(_startTime);
117-
118-
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo2);
119-
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo2);
120108
}
121109

122110
public void Dispose()

‎src/OctoshiftCLI.IntegrationTests/BbsAzureWindowsToGithub.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace OctoshiftCLI.IntegrationTests;
1313
[Collection("Integration Tests")]
1414
public sealed class BbsAzureWindowsToGithub : IDisposable
1515
{
16-
private const string SSH_KEY_FILE = "ssh_key.pem";
1716
private const string UPLOADS_URL = "https://uploads.github.com";
1817

1918
private readonly ITestOutputHelper _output;
@@ -72,9 +71,7 @@ public async Task MigrateRepo_BbsWindows_AzureStorage()
7271
var bbsProjectKey = $"E2E-{TestHelper.GetOsName().ToUpper()}";
7372
var githubTargetOrg = $"octoshift-e2e-bbs-{TestHelper.GetOsName()}";
7473
var repo1 = $"{bbsProjectKey}-repo-1";
75-
var repo2 = $"{bbsProjectKey}-repo-2";
7674
var targetRepo1 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-1";
77-
var targetRepo2 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-2";
7875

7976
var sourceBbsApi = new BbsApi(_sourceBbsClient, bbsServer, _logger);
8077
var sourceHelper = new TestHelper(_output, sourceBbsApi, _sourceBbsClient, bbsServer);
@@ -90,8 +87,6 @@ await retryPolicy.Retry(async () =>
9087
await sourceHelper.CreateBbsProject(bbsProjectKey);
9188
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo1);
9289
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo1);
93-
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo2);
94-
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo2);
9590
});
9691

9792
// Use SMB for archive download (Windows BBS server)
@@ -108,14 +103,6 @@ await _targetHelper.RunBbsCliMigration(
108103

109104
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo1);
110105
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo1);
111-
112-
await _targetHelper.RunBbsCliMigration(
113-
$"migrate-repo --github-org {githubTargetOrg} --bbs-server-url {bbsServer} --bbs-project {bbsProjectKey} --bbs-repo {repo2} --github-repo {targetRepo2}{archiveDownloadOptions}", _tokens);
114-
115-
_targetHelper.AssertNoErrorInLogs(_startTime);
116-
117-
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo2);
118-
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo2);
119106
}
120107

121108
public void Dispose()

‎src/OctoshiftCLI.IntegrationTests/BbsGithubStorageToGithub.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ public async Task MigrateRepo_BbsLinux_GithubStorage()
7272
var bbsProjectKey = $"E2E-{TestHelper.GetOsName().ToUpper()}";
7373
var githubTargetOrg = $"octoshift-e2e-bbs-{TestHelper.GetOsName()}";
7474
var repo1 = $"{bbsProjectKey}-repo-1";
75-
var repo2 = $"{bbsProjectKey}-repo-2";
7675
var targetRepo1 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-1";
77-
var targetRepo2 = $"{bbsProjectKey}-e2e-{TestHelper.GetOsName().ToLower()}-repo-2";
7876

7977
var sourceBbsApi = new BbsApi(_sourceBbsClient, bbsServer, _logger);
8078
var sourceHelper = new TestHelper(_output, sourceBbsApi, _sourceBbsClient, bbsServer);
@@ -90,8 +88,6 @@ await retryPolicy.Retry(async () =>
9088
await sourceHelper.CreateBbsProject(bbsProjectKey);
9189
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo1);
9290
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo1);
93-
await sourceHelper.CreateBbsRepo(bbsProjectKey, repo2);
94-
await sourceHelper.InitializeBbsRepo(bbsProjectKey, repo2);
9591
});
9692

9793
// Use SSH for archive download
@@ -109,14 +105,6 @@ await _targetHelper.RunBbsCliMigration(
109105

110106
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo1);
111107
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo1);
112-
113-
await _targetHelper.RunBbsCliMigration(
114-
$"migrate-repo --github-org {githubTargetOrg} --bbs-server-url {bbsServer} --bbs-project {bbsProjectKey} --bbs-repo {repo2} --github-repo {targetRepo2}{archiveDownloadOptions}{githubStorageOptions}", _tokens);
115-
116-
_targetHelper.AssertNoErrorInLogs(_startTime);
117-
118-
await _targetHelper.AssertGithubRepoExists(githubTargetOrg, targetRepo2);
119-
await _targetHelper.AssertGithubRepoInitialized(githubTargetOrg, targetRepo2);
120108
}
121109

122110
public void Dispose()

0 commit comments

Comments
 (0)