99 "io"
1010 "os"
1111 "path/filepath"
12+ "sigs.k8s.io/yaml"
1213 "strings"
1314 "testing"
1415 "time"
@@ -54,13 +55,29 @@ func runPipelineTests(t *testing.T, doSetup func(t *testing.T, namespace string)
5455 debugAndFailTest (ta , fmt .Sprintf ("file %s did not produce a pipelinerun: %#v" , runYamlPath , obj ))
5556 }
5657
57- gavs := os .Getenv ("GAVS " )
58+ set := os .Getenv ("TESTSET " )
5859 //if the GAVS env var is set then we just create pre-defined GAVS
5960 //otherwise we do a full build of a sample project
60- if len (gavs ) > 0 {
61+ if len (set ) > 0 {
62+ bytes , err := os .ReadFile (filepath .Clean (filepath .Join (path , "minikube.yaml" )))
63+ if err != nil {
64+ debugAndFailTest (ta , err .Error ())
65+ return
66+ }
67+ testData := map [string ][]string {}
68+ err = yaml .Unmarshal (bytes , & testData )
69+ if err != nil {
70+ debugAndFailTest (ta , err .Error ())
71+ return
72+ }
6173
62- parts := strings .Split (gavs , "," )
74+ parts := testData [set ]
75+ if len (parts ) == 0 {
76+ debugAndFailTest (ta , "No test data for " + set )
77+ return
78+ }
6379 for _ , s := range parts {
80+ ta .Logf (fmt .Sprintf ("Creating ArtifactBuild for GAV: %s" , s ))
6481 ab := v1alpha1.ArtifactBuild {}
6582 ab .Name = artifactbuild .CreateABRName (s )
6683 ab .Namespace = ta .ns
@@ -122,7 +139,7 @@ func runPipelineTests(t *testing.T, doSetup func(t *testing.T, namespace string)
122139 abList , err := jvmClient .JvmbuildserviceV1alpha1 ().ArtifactBuilds (ta .ns ).List (context .TODO (), metav1.ListOptions {})
123140 if err != nil {
124141 ta .Logf (fmt .Sprintf ("error list artifactbuilds: %s" , err .Error ()))
125- return false , nil
142+ return false , err
126143 }
127144 //we want to make sure there is more than one ab, and that they are all complete
128145 abComplete := len (abList .Items ) > 0
@@ -137,21 +154,21 @@ func runPipelineTests(t *testing.T, doSetup func(t *testing.T, namespace string)
137154 dbList , err := jvmClient .JvmbuildserviceV1alpha1 ().DependencyBuilds (ta .ns ).List (context .TODO (), metav1.ListOptions {})
138155 if err != nil {
139156 ta .Logf (fmt .Sprintf ("error list dependencybuilds: %s" , err .Error ()))
140- return false , nil
157+ return false , err
141158 }
142159 dbComplete := len (dbList .Items ) > 0
143160 ta .Logf (fmt .Sprintf ("number of dependencybuilds: %d" , len (dbList .Items )))
144161 dbCompleteCount := 0
145162 for _ , db := range dbList .Items {
146- if db .Status .State != v1alpha1 .DependencyBuildStateComplete {
163+ if db .Status .State == v1alpha1 .DependencyBuildStateFailed {
164+ ta .Logf (fmt .Sprintf ("depedencybuild %s FAILED" , db .Spec .ScmInfo .SCMURL ))
165+ return false , fmt .Errorf ("depedencybuild %s for repo %s FAILED" , db .Name , db .Spec .ScmInfo .SCMURL )
166+ } else if db .Status .State != v1alpha1 .DependencyBuildStateComplete {
147167 if dbComplete {
148168 //only print the first one
149169 ta .Logf (fmt .Sprintf ("depedencybuild %s not complete" , db .Spec .ScmInfo .SCMURL ))
150170 }
151171 dbComplete = false
152- } else if db .Status .State == v1alpha1 .DependencyBuildStateFailed {
153- ta .Logf (fmt .Sprintf ("depedencybuild %s FAILED" , db .Spec .ScmInfo .SCMURL ))
154- return false , fmt .Errorf ("depedencybuild %s for repo %s FAILED" , db .Name , db .Spec .ScmInfo .SCMURL )
155172 } else if db .Status .State == v1alpha1 .DependencyBuildStateComplete {
156173 dbCompleteCount ++
157174 }
@@ -167,7 +184,7 @@ func runPipelineTests(t *testing.T, doSetup func(t *testing.T, namespace string)
167184 }
168185 })
169186
170- if len (gavs ) > 0 {
187+ if len (set ) > 0 {
171188 //no futher checks required here
172189 //we are just checking that the GAVs in question actually build
173190 return
0 commit comments