From 55e48cca86297f51df351a3e6e2b461c2ba58f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 1 Feb 2023 20:43:07 +0800 Subject: [PATCH 1/6] Include nginx cookbook in local deps (for testing) --- site-cookbooks/kosmos_rsk/Berksfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site-cookbooks/kosmos_rsk/Berksfile b/site-cookbooks/kosmos_rsk/Berksfile index 34fea21..8206ad0 100644 --- a/site-cookbooks/kosmos_rsk/Berksfile +++ b/site-cookbooks/kosmos_rsk/Berksfile @@ -1,3 +1,5 @@ source 'https://supermarket.chef.io' +cookbook 'kosmos-nginx', path: '../../site-cookbooks/kosmos-nginx' + metadata From a7b990c64fd7824dc29564c2cfc0d7826acf371f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 1 Feb 2023 20:43:41 +0800 Subject: [PATCH 2/6] Update preseed syntax --- site-cookbooks/kosmos_rsk/templates/rskj-preseed.cfg.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos_rsk/templates/rskj-preseed.cfg.erb b/site-cookbooks/kosmos_rsk/templates/rskj-preseed.cfg.erb index d0b825b..28c9efe 100644 --- a/site-cookbooks/kosmos_rsk/templates/rskj-preseed.cfg.erb +++ b/site-cookbooks/kosmos_rsk/templates/rskj-preseed.cfg.erb @@ -1,6 +1,6 @@ #_preseed_V1 # Do you agree to the terms of the applicable licenses? -rskj shared/accepted-rsk-license-v1-1 boolean true +rskj shared/accepted-rsk-license-v1-1 select true # Choose a configuration environment to run your node. # Choices: mainnet, testnet, regtest rskj shared/config select <%= @network %> From 9c33fbda215494243b2f05d6453455467de8265e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 1 Feb 2023 20:44:07 +0800 Subject: [PATCH 3/6] Bump rskj version --- site-cookbooks/kosmos_rsk/attributes/default.rb | 2 +- site-cookbooks/kosmos_rsk/test/integration/rskj/rskj_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos_rsk/attributes/default.rb b/site-cookbooks/kosmos_rsk/attributes/default.rb index 562ca5d..63efc04 100644 --- a/site-cookbooks/kosmos_rsk/attributes/default.rb +++ b/site-cookbooks/kosmos_rsk/attributes/default.rb @@ -1,2 +1,2 @@ -node.default['rskj']['version'] = '4.1.0~focal' +node.default['rskj']['version'] = '4.2.0~focal' node.default['rskj']['network'] = 'testnet' diff --git a/site-cookbooks/kosmos_rsk/test/integration/rskj/rskj_test.rb b/site-cookbooks/kosmos_rsk/test/integration/rskj/rskj_test.rb index 503dcaf..a37cf79 100644 --- a/site-cookbooks/kosmos_rsk/test/integration/rskj/rskj_test.rb +++ b/site-cookbooks/kosmos_rsk/test/integration/rskj/rskj_test.rb @@ -9,7 +9,7 @@ end describe package('rskj') do it { should be_installed } - its('version') { should eq '2.2.0~focal' } + its('version') { should eq '4.2.0~focal' } end describe service('rsk') do From f9e7d98bf9bc34dbb12c7d6cb483f5aff8ad8e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 1 Feb 2023 20:44:45 +0800 Subject: [PATCH 4/6] Document testing commands --- site-cookbooks/kosmos_rsk/README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos_rsk/README.md b/site-cookbooks/kosmos_rsk/README.md index 18cafc8..4ab209a 100644 --- a/site-cookbooks/kosmos_rsk/README.md +++ b/site-cookbooks/kosmos_rsk/README.md @@ -1,3 +1,14 @@ # kosmos_rsk -Configures/deploys RSK-related software. +Configures/deploys RSKj and related software. + +## Testing + +With a Docker daemon running: + +```bash +kitchen create +kitchen converge +kitchen verify +kitchen destroy +``` From d04e2f4fd508a90d09866650c95dd1ab94857069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 1 Feb 2023 20:45:01 +0800 Subject: [PATCH 5/6] Bump cookbook version --- site-cookbooks/kosmos_rsk/CHANGELOG.md | 5 +++++ site-cookbooks/kosmos_rsk/metadata.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos_rsk/CHANGELOG.md b/site-cookbooks/kosmos_rsk/CHANGELOG.md index 6c75b43..d8aca13 100644 --- a/site-cookbooks/kosmos_rsk/CHANGELOG.md +++ b/site-cookbooks/kosmos_rsk/CHANGELOG.md @@ -2,6 +2,11 @@ This file is used to list changes made in each version of the kosmos_rsk cookbook. +## 0.3.0 + +* Bump rskj version +* Fix tests + ## 0.2.0 Add nginx recipe to configure public API access. diff --git a/site-cookbooks/kosmos_rsk/metadata.rb b/site-cookbooks/kosmos_rsk/metadata.rb index 23e7d33..6f0c24a 100644 --- a/site-cookbooks/kosmos_rsk/metadata.rb +++ b/site-cookbooks/kosmos_rsk/metadata.rb @@ -2,8 +2,8 @@ name 'kosmos_rsk' maintainer 'Kosmos Developers' maintainer_email 'ops@kosmos.org' license 'MIT' -description 'Installs/configures RSK and related software' -version '0.2.0' +description 'Installs/configures RSKj and related software' +version '0.3.0' chef_version '>= 15.0' issues_url 'https://gitea.kosmos.org/kosmos/chef/issues' source_url 'https://gitea.kosmos.org/kosmos/chef' From 5e709a3a4fc5fa90efe52e71e91d0f8a51d161a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 1 Feb 2023 21:53:31 +0800 Subject: [PATCH 6/6] Update node configs --- nodes/rsk-mainnet-2.json | 10 +++++----- nodes/rsk-testnet-3.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nodes/rsk-mainnet-2.json b/nodes/rsk-mainnet-2.json index 5d6017a..1528a72 100644 --- a/nodes/rsk-mainnet-2.json +++ b/nodes/rsk-mainnet-2.json @@ -8,19 +8,19 @@ "automatic": { "fqdn": "rsk-mainnet-2", "os": "linux", - "os_version": "5.4.0-1075-kvm", + "os_version": "5.4.0-1084-kvm", "hostname": "rsk-mainnet-2", "ipaddress": "192.168.122.208", "roles": [ - "rskj_mainnet", - "kvm_guest" + "kvm_guest", + "rskj_mainnet" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_kvm::guest", "kosmos_rsk::rskj", "kosmos_rsk::nginx", - "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -70,4 +70,4 @@ "role[kvm_guest]", "role[rskj_mainnet]" ] -} +} \ No newline at end of file diff --git a/nodes/rsk-testnet-3.json b/nodes/rsk-testnet-3.json index e9b0cf4..b9f6616 100644 --- a/nodes/rsk-testnet-3.json +++ b/nodes/rsk-testnet-3.json @@ -8,19 +8,19 @@ "automatic": { "fqdn": "rsk-testnet-3", "os": "linux", - "os_version": "5.4.0-1075-kvm", + "os_version": "5.4.0-1084-kvm", "hostname": "rsk-testnet-3", "ipaddress": "192.168.122.231", "roles": [ - "rskj_testnet", - "kvm_guest" + "kvm_guest", + "rskj_testnet" ], "recipes": [ "kosmos-base", "kosmos-base::default", + "kosmos_kvm::guest", "kosmos_rsk::rskj", "kosmos_rsk::nginx", - "kosmos_kvm::guest", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -70,4 +70,4 @@ "role[kvm_guest]", "role[rskj_testnet]" ] -} +} \ No newline at end of file