DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #168 from ionutbalutoiu/fix-e2e-tests

Browse source 
Fix `waitPoolRunningIdleInstances` function
This commit is contained in:
Gabriel 2023-08-24 16:43:16 +03:00 • committed by GitHub
commit e314688ad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/integration/e2e/instances.go
View file

@ -88,9 +88,11 @@ func waitPoolRunningIdleInstances(poolID string, timeout time.Duration) error {
poolInstances = make(params.Instances, 0)
runningIdleCount := 0
for _, instance := range instances {
if instance.PoolID == poolID {
poolInstances = append(poolInstances, instance)
if instance.PoolID != poolID {
continue
}
// current instance belongs to the pool we are waiting for
poolInstances = append(poolInstances, instance)
if instance.Status == commonParams.InstanceRunning && instance.RunnerStatus == params.RunnerIdle {
runningIdleCount++
}

4
test/integration/e2e/organizations.go
View file

@ -102,9 +102,8 @@ func WaitOrgRunningIdleInstances(orgID string, timeout time.Duration) {
}
func dumpOrgInstancesDetails(orgID string) error {
log.Printf("Dumping org %s instances details", orgID)
// print org details
log.Printf("Dumping org %s details", orgID)
org, err := getOrg(cli, authToken, orgID)
if err != nil {
return err
@ -114,6 +113,7 @@ func dumpOrgInstancesDetails(orgID string) error {
}
// print org instances details
log.Printf("Dumping org %s instances details", orgID)
instances, err := listOrgInstances(cli, authToken, orgID)
if err != nil {
return err

4
test/integration/e2e/repositories.go
View file

@ -103,9 +103,8 @@ func WaitRepoRunningIdleInstances(repoID string, timeout time.Duration) {
}
func dumpRepoInstancesDetails(repoID string) error {
log.Printf("Dumping repo %s instances details", repoID)
// print repo details
log.Printf("Dumping repo %s details", repoID)
repo, err := getRepo(cli, authToken, repoID)
if err != nil {
return err
@ -115,6 +114,7 @@ func dumpRepoInstancesDetails(repoID string) error {
}
// print repo instances details
log.Printf("Dumping repo %s instances details", repoID)
instances, err := listRepoInstances(cli, authToken, repoID)
if err != nil {
return err