update tests

skudasov · skudasov · commit cdb15f824a51 · 2024-11-08T10:04:03.000+01:00
diff --git a/.github/workflows/framework-golden-tests.yml b/.github/workflows/framework-golden-tests.yml
@@ -30,10 +30,14 @@ jobs:
             config: chaos.toml
             count: 1
             timeout: 10m
-          - name: TestReload
+          - name: TestUpgradeAll
             config: upgrade_all.toml
             count: 1
             timeout: 10m
+          - name: TestUpgradeSome
+            config: upgrade_some.toml
+            count: 1
+            timeout: 10m
     steps:
       - name: Checkout repo
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
diff --git a/framework/examples/myproject/upgrade_all.toml b/framework/examples/myproject/upgrade_all.toml
@@ -20,44 +20,4 @@
 
     [nodeset.node_specs.node]
       image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
-      pull_image = false
-
-  [[nodeset.node_specs]]
-
-    [nodeset.node_specs.db]
-      image = "postgres:15.6"
-      pull_image = true
-
-    [nodeset.node_specs.node]
-      image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
-      pull_image = false
-
-  [[nodeset.node_specs]]
-
-    [nodeset.node_specs.db]
-      image = "postgres:15.6"
-      pull_image = true
-
-    [nodeset.node_specs.node]
-      image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
-      pull_image = false
-
-  [[nodeset.node_specs]]
-
-    [nodeset.node_specs.db]
-      image = "postgres:15.6"
-      pull_image = true
-
-    [nodeset.node_specs.node]
-      image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
-      pull_image = false
-
-  [[nodeset.node_specs]]
-
-    [nodeset.node_specs.db]
-      image = "postgres:15.6"
-      pull_image = true
-
-    [nodeset.node_specs.node]
-      image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
-      pull_image = false
+      pull_image = false
diff --git a/framework/examples/myproject/upgrade_all_test.go b/framework/examples/myproject/upgrade_all_test.go
@@ -19,7 +19,7 @@ type CfgUpgradeAll struct {
 }
 
 func TestUpgradeAll(t *testing.T) {
-	in, err := framework.Load[CfgReload](t)
+	in, err := framework.Load[CfgUpgradeAll](t)
 	require.NoError(t, err)
 
 	bc, err := blockchain.NewBlockchainNetwork(in.BlockchainA)
@@ -42,7 +42,7 @@ func TestUpgradeAll(t *testing.T) {
 										level = 'info'
 `
 
-	out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 10*time.Second)
+	out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 5*time.Second)
 	require.NoError(t, err)
 
 	jobs, _, err := c[0].ReadJobs()
diff --git a/framework/examples/myproject/upgrade_some_test.go b/framework/examples/myproject/upgrade_some_test.go
@@ -37,7 +37,7 @@ type CfgReload struct {
 	NodeSet            *ns.Input         `toml:"nodeset" validate:"required"`
 }
 
-func TestReload(t *testing.T) {
+func TestUpgradeSome(t *testing.T) {
 	in, err := framework.Load[CfgReload](t)
 	require.NoError(t, err)
 
@@ -66,7 +66,7 @@ func TestReload(t *testing.T) {
 										level = 'info'
 `
 
-	out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 10*time.Second)
+	out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 5*time.Second)
 	require.NoError(t, err)
 
 	jobs, _, err := c[0].ReadJobs()

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ type CfgUpgradeAll struct {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func TestUpgradeAll(t *testing.T) {`
`22`		`- in, err := framework.Load[CfgReload](t)`
	`22`	`+ in, err := framework.Load[CfgUpgradeAll](t)`
`23`	`23`	`require.NoError(t, err)`
`24`	`24`
`25`	`25`	`bc, err := blockchain.NewBlockchainNetwork(in.BlockchainA)`
`@@ -42,7 +42,7 @@ func TestUpgradeAll(t *testing.T) {`
`42`	`42`	`level = 'info'`
`43`	`43`	`
`44`	`44`
`45`		`- out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 10*time.Second)`
	`45`	`+ out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 5*time.Second)`
`46`	`46`	`require.NoError(t, err)`
`47`	`47`
`48`	`48`	`jobs, _, err := c[0].ReadJobs()`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ type CfgReload struct {`
`37`	`37`	NodeSet *ns.Input `toml:"nodeset" validate:"required"`
`38`	`38`	`}`
`39`	`39`
`40`		`-func TestReload(t *testing.T) {`
	`40`	`+func TestUpgradeSome(t *testing.T) {`
`41`	`41`	`in, err := framework.Load[CfgReload](t)`
`42`	`42`	`require.NoError(t, err)`
`43`	`43`
`@@ -66,7 +66,7 @@ func TestReload(t *testing.T) {`
`66`	`66`	`level = 'info'`
`67`	`67`	`
`68`	`68`
`69`		`- out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 10*time.Second)`
	`69`	`+ out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 5*time.Second)`
`70`	`70`	`require.NoError(t, err)`
`71`	`71`
`72`	`72`	`jobs, _, err := c[0].ReadJobs()`