update tests

smartcontractkit · Nov 8, 2024 · cdb15f8 · cdb15f8
1 parent 938000e
commit cdb15f8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 46 deletions.
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.go → ...rk/examples/myproject/upgrade_all_test.go b/framework/examples/myproject/upgrade_all.go → ...rk/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.go → ...k/examples/myproject/upgrade_some_test.go b/framework/examples/myproject/upgrade_some.go → ...k/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()