4949 indexImage2 = dockerHost + "/olmtest/e2e-index:" + indexTag2
5050 indexImage3 = dockerHost + "/olmtest/e2e-index:" + indexTag3
5151
52+ fbcIndexImageTag = dockerHost + "/olmtest/e2e-fbc"
53+ fbcPackageName = "webhook-operator"
54+
5255 // publishedIndex is an index used to check for regressions in opm's behavior.
5356 publishedIndex = os .Getenv ("PUBLISHED_INDEX" )
5457)
@@ -68,23 +71,26 @@ func (bl bundleLocations) images() []string {
6871 return images
6972}
7073
71- func inTemporaryBuildContext (f func () error ) (rerr error ) {
74+ func inTemporaryBuildContext (f func () error , fromDir , toDir string ) (rerr error ) {
7275 td , err := ioutil .TempDir ("." , "opm-" )
7376 if err != nil {
7477 return err
7578 }
76- err = copy .Copy ("../../manifests" , filepath .Join (td , "manifests" ))
79+ err = copy .Copy (fromDir , filepath .Join (td , toDir ))
7780 if err != nil {
7881 return err
7982 }
83+
8084 wd , err := os .Getwd ()
8185 if err != nil {
8286 return err
8387 }
88+
8489 err = os .Chdir (td )
8590 if err != nil {
8691 return err
8792 }
93+
8894 defer func () {
8995 err := os .Chdir (wd )
9096 if rerr == nil {
@@ -94,6 +100,51 @@ func inTemporaryBuildContext(f func() error) (rerr error) {
94100 return f ()
95101}
96102
103+ func executeCommand (cmd * exec.Cmd ) error {
104+ cmd .Stdout = os .Stdout
105+ cmd .Stderr = os .Stderr
106+
107+ if err := cmd .Run (); err != nil {
108+ return fmt .Errorf ("Failed to exec %#v: %v" , cmd .Args , err )
109+ }
110+
111+ return nil
112+ }
113+
114+ // buildFBCWith builds a file based catalog image in the local registry
115+ func buildFBCWith (containerTool , image string ) error {
116+ err := inTemporaryBuildContext (func () error {
117+ cmd , err := buildFBCImage (image , containerTool , "file-based-catalog.Dockerfile" )
118+ if err != nil {
119+ return err
120+ }
121+
122+ return executeCommand (cmd )
123+ }, "../../fbc-dir" , "" )
124+
125+ if err != nil {
126+ return err
127+ }
128+
129+ return nil
130+ }
131+
132+ // buildFBCImagce uses docker or podman an executes the build command of a dockerfile
133+ func buildFBCImage (imageTag , imageBuilder string , dockerFile string ) (* exec.Cmd , error ) {
134+ var args []string
135+
136+ switch imageBuilder {
137+ case "docker" , "podman" :
138+ args = append (args , "build" , "-f" , dockerFile , "-t" , imageTag , "." )
139+ case "buildah" :
140+ args = append (args , "bud" , "--format=docker" , "-f" , dockerFile , "-t" , imageTag , "." )
141+ default :
142+ return nil , fmt .Errorf ("%s is not supported image builder" , imageBuilder )
143+ }
144+
145+ return exec .Command (imageBuilder , args ... ), nil
146+ }
147+
97148func buildIndexWith (containerTool , fromIndexImage , toIndexImage string , bundleImages []string , mode registry.Mode , overwriteLatest bool ) error {
98149 logger := logrus .WithFields (logrus.Fields {"bundles" : bundleImages })
99150 indexAdder := indexer .NewIndexAdder (containertools .NewContainerTool (containerTool , containertools .NoneTool ), containertools .NewContainerTool (containerTool , containertools .NoneTool ), logger )
@@ -136,17 +187,17 @@ func buildFromIndexWith(containerTool string) error {
136187}
137188
138189// TODO(djzager): make this more complete than what should be a simple no-op
139- func pruneIndexWith (containerTool string ) error {
140- logger := logrus .WithFields (logrus.Fields {"packages" : packageName })
190+ func pruneIndexWith (containerTool string , fromIndex string , tag string , packageValue string ) error {
191+ logger := logrus .WithFields (logrus.Fields {"packages" : packageValue })
141192 indexAdder := indexer .NewIndexPruner (containertools .NewContainerTool (containerTool , containertools .NoneTool ), logger )
142193
143194 request := indexer.PruneFromIndexRequest {
144195 Generate : false ,
145- FromIndex : indexImage2 ,
196+ FromIndex : fromIndex ,
146197 BinarySourceImage : "" ,
147198 OutDockerfile : "" ,
148- Tag : indexImage3 ,
149- Packages : []string {packageName },
199+ Tag : tag ,
200+ Packages : []string {packageValue },
150201 Permissive : false ,
151202 }
152203
@@ -226,7 +277,7 @@ var _ = Describe("opm", func() {
226277 img := bundleImage + ":" + bundleTag3
227278 err := inTemporaryBuildContext (func () error {
228279 return bundle .BuildFunc (bundlePath3 , "" , img , containerTool , packageName , channels , defaultChannel , false )
229- })
280+ }, "../../manifests" , "manifests" )
230281 Expect (err ).NotTo (HaveOccurred ())
231282
232283 By ("pushing bundle" )
@@ -271,7 +322,7 @@ var _ = Describe("opm", func() {
271322 for _ , b := range bundles {
272323 err = inTemporaryBuildContext (func () error {
273324 return bundle .BuildFunc (b .path , "" , b .image , containerTool , packageName , channels , defaultChannel , false )
274- })
325+ }, "../../manifests" , "manifests" )
275326 Expect (err ).NotTo (HaveOccurred ())
276327 }
277328
@@ -296,10 +347,22 @@ var _ = Describe("opm", func() {
296347 err = pushWith (containerTool , indexImage2 )
297348 Expect (err ).NotTo (HaveOccurred ())
298349
350+ By ("building a fbc index" )
351+ err = buildFBCWith (containerTool , fbcIndexImageTag )
352+ Expect (err ).NotTo (HaveOccurred ())
353+
354+ By ("pushing a fbc index" )
355+ err = pushWith (containerTool , fbcIndexImageTag )
356+ Expect (err ).NotTo (HaveOccurred ())
357+
299358 By ("pruning an index" )
300- err = pruneIndexWith (containerTool )
359+ err = pruneIndexWith (containerTool , indexImage2 , indexImage3 , packageName )
301360 Expect (err ).NotTo (HaveOccurred ())
302361
362+ By ("pruning a fbc index" )
363+ err = pruneIndexWith (containerTool , fbcIndexImageTag , indexImage3 , fbcPackageName )
364+ Expect (err ).To (MatchError (indexer .ErrFileBasedCatalogPrune ))
365+
303366 By ("pushing an index" )
304367 err = pushWith (containerTool , indexImage3 )
305368 Expect (err ).NotTo (HaveOccurred ())
0 commit comments