Upgrade RSKj, fix and document test suite #465

Merged
greg merged 7 commits from core/upgrade_rskj into master 2023-02-14 13:01:55 +00:00
9 changed files with 34 additions and 16 deletions

View File

@ -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]"
]
}
}

View File

@ -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]"
]
}
}

View File

@ -1,3 +1,5 @@
source 'https://supermarket.chef.io'
cookbook 'kosmos-nginx', path: '../../site-cookbooks/kosmos-nginx'
metadata

View File

@ -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.

View File

@ -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
```

View File

@ -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'

View File

@ -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'

View File

@ -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 %>

View File

@ -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