Skip to content

Commit bf5e886

Browse files
Jeff Peelernjhale
authored andcommitted
fix(e2e): remove local dev test registry image
The test data for generating this custom image uses a go script to generate and populate an operator registry database that references a bundle image.
1 parent 914ae21 commit bf5e886

File tree

3 files changed

+56
-1
lines changed

3 files changed

+56
-1
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# docker build -t quay.io/olmtest/installplan_e2e-registry-image:latest .
2+
FROM quay.io/operator-framework/operator-registry-server
3+
4+
LABEL OLMTest="TestInstallPlanFromBundleImage"
5+
6+
COPY ./bundles.db /bundles.db
7+
8+
EXPOSE 50051
9+
ENTRYPOINT ["/registry-server"]
10+
CMD ["--database", "bundles.db"]
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package main
2+
3+
import (
4+
"context"
5+
"database/sql"
6+
"fmt"
7+
"os"
8+
9+
"github.com/operator-framework/operator-registry/pkg/sqlite"
10+
)
11+
12+
func checkErr(err error) {
13+
if err != nil {
14+
panic(err)
15+
}
16+
}
17+
18+
func main() {
19+
dbFile := "bundles.db"
20+
bundleImage := "quay.io/olmtest/installplan_e2e-bundle-image:latest"
21+
dataPath := "../kiali-manifests"
22+
23+
// start with a clean slate
24+
os.Remove(dbFile)
25+
26+
// create database
27+
db, err := sql.Open("sqlite3", dbFile)
28+
checkErr(err)
29+
30+
dbLoader, err := sqlite.NewSQLLiteLoader(db)
31+
checkErr(err)
32+
33+
err = dbLoader.Migrate(context.TODO())
34+
checkErr(err)
35+
36+
// populate database with data
37+
loader := sqlite.NewSQLLoaderForDirectory(dbLoader, dataPath)
38+
err = loader.Populate()
39+
checkErr(err)
40+
41+
// add a bundlepath for kiali 1.4.2 so that later a bundle image lookup is performed
42+
updateSQL := fmt.Sprintf(`UPDATE operatorbundle SET bundlepath = '%v' WHERE version = "1.4.2";`, bundleImage)
43+
_, err = db.Exec(updateSQL)
44+
checkErr(err)
45+
}

test/e2e/installplan_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2638,7 +2638,7 @@ func TestInstallPlanFromBundleImage(t *testing.T) {
26382638
Labels: map[string]string{"olm.catalogSource": "kaili-catalog"},
26392639
},
26402640
Spec: v1alpha1.CatalogSourceSpec{
2641-
Image: "quay.io/jpeeler/registry-image:latest",
2641+
Image: "quay.io/olmtest/installplan_e2e-registry-image:latest",
26422642
SourceType: v1alpha1.SourceTypeGrpc,
26432643
},
26442644
}

0 commit comments

Comments
 (0)