@@ -591,7 +591,7 @@ func setupSuite(tb testing.TB) (func(tb testing.TB), *models.Database) {
591
591
// migrate tables
592
592
err = gdb .AutoMigrate (& models.Policy {}, & models.Organisation {}, & models.Repo {}, & models.Project {}, & models.Token {},
593
593
& models.User {}, & models.ProjectRun {}, & models.GithubAppInstallation {}, & models.GithubApp {}, & models.GithubAppInstallationLink {},
594
- & models.GithubDiggerJobLink {}, & models.DiggerJob {}, & models.DiggerJobParentLink {})
594
+ & models.GithubDiggerJobLink {}, & models.DiggerJob {}, & models.DiggerJobParentLink {}, & models. JobToken {} )
595
595
if err != nil {
596
596
log .Fatal (err )
597
597
}
@@ -732,7 +732,7 @@ func TestJobsTreeWithOneJobsAndTwoProjects(t *testing.T) {
732
732
graph , err := configuration .CreateProjectDependencyGraph (projects )
733
733
assert .NoError (t , err )
734
734
735
- _ , result , err := utils .ConvertJobsToDiggerJobs (jobs , projectMap , graph , 41584295 , "" , 2 , "diggerhq" , "parallel_jobs_demo" , "diggerhq/parallel_jobs_demo" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
735
+ _ , result , err := utils .ConvertJobsToDiggerJobs (1 , jobs , projectMap , graph , 41584295 , "" , 2 , "diggerhq" , "parallel_jobs_demo" , "diggerhq/parallel_jobs_demo" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
736
736
assert .NoError (t , err )
737
737
assert .Equal (t , 1 , len (result ))
738
738
parentLinks , err := models .DB .GetDiggerJobParentLinksChildId (& result ["dev" ].DiggerJobID )
@@ -761,7 +761,7 @@ func TestJobsTreeWithTwoDependantJobs(t *testing.T) {
761
761
projectMap ["dev" ] = project1
762
762
projectMap ["prod" ] = project2
763
763
764
- _ , result , err := utils .ConvertJobsToDiggerJobs (jobs , projectMap , graph , 123 , "" , 2 , "" , "" , "test" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
764
+ _ , result , err := utils .ConvertJobsToDiggerJobs (1 , jobs , projectMap , graph , 123 , "" , 2 , "" , "" , "test" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
765
765
assert .NoError (t , err )
766
766
assert .Equal (t , 2 , len (result ))
767
767
@@ -794,7 +794,7 @@ func TestJobsTreeWithTwoIndependentJobs(t *testing.T) {
794
794
projectMap ["dev" ] = project1
795
795
projectMap ["prod" ] = project2
796
796
797
- _ , result , err := utils .ConvertJobsToDiggerJobs (jobs , projectMap , graph , 123 , "" , 2 , "" , "" , "test" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
797
+ _ , result , err := utils .ConvertJobsToDiggerJobs (1 , jobs , projectMap , graph , 123 , "" , 2 , "" , "" , "test" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
798
798
assert .NoError (t , err )
799
799
assert .Equal (t , 2 , len (result ))
800
800
parentLinks , err := models .DB .GetDiggerJobParentLinksChildId (& result ["dev" ].DiggerJobID )
@@ -839,7 +839,7 @@ func TestJobsTreeWithThreeLevels(t *testing.T) {
839
839
projectMap ["555" ] = project5
840
840
projectMap ["666" ] = project6
841
841
842
- _ , result , err := utils .ConvertJobsToDiggerJobs (jobs , projectMap , graph , 123 , "" , 2 , "" , "" , "test" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
842
+ _ , result , err := utils .ConvertJobsToDiggerJobs (1 , jobs , projectMap , graph , 123 , "" , 2 , "" , "" , "test" , 123 , "test" , orchestrator_scheduler .BatchTypeApply )
843
843
assert .NoError (t , err )
844
844
assert .Equal (t , 6 , len (result ))
845
845
parentLinks , err := models .DB .GetDiggerJobParentLinksChildId (& result ["111" ].DiggerJobID )
0 commit comments