Upgrade rskj to v9.0.1 and Ubuntu 24.04
This commit is contained in:
@@ -1,5 +1,8 @@
|
|||||||
source 'https://supermarket.chef.io'
|
source 'https://supermarket.chef.io'
|
||||||
|
|
||||||
cookbook 'kosmos-nginx', path: '../../site-cookbooks/kosmos-nginx'
|
cookbook 'kosmos_openresty', path: '../../site-cookbooks/kosmos_openresty'
|
||||||
|
cookbook 'kosmos-base', path: '../../site-cookbooks/kosmos-base'
|
||||||
|
cookbook 'openresty', path: '../../site-cookbooks/openresty'
|
||||||
|
cookbook 'kosmos-postfix', path: '../../site-cookbooks/kosmos-postfix'
|
||||||
|
|
||||||
metadata
|
metadata
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
node.default['rskj']['version'] = '7.0.0~jammy'
|
node.default['rskj']['version'] = '9.0.1~noble'
|
||||||
node.default['rskj']['network'] = 'testnet'
|
node.default['rskj']['network'] = 'testnet'
|
||||||
|
|
||||||
node.default['rskj']['nginx']['domain'] = nil
|
node.default['rskj']['nginx']['domain'] = nil
|
||||||
|
|||||||
@@ -34,9 +34,9 @@ verifier:
|
|||||||
name: inspec
|
name: inspec
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
- name: ubuntu-22.04
|
- name: ubuntu-24.04
|
||||||
driver:
|
driver:
|
||||||
image: dokken/ubuntu-22.04
|
image: dokken/ubuntu-24.04
|
||||||
privileged: true
|
privileged: true
|
||||||
pid_one_command: /usr/lib/systemd/systemd
|
pid_one_command: /usr/lib/systemd/systemd
|
||||||
intermediate_instructions:
|
intermediate_instructions:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ maintainer 'Kosmos Developers'
|
|||||||
maintainer_email 'ops@kosmos.org'
|
maintainer_email 'ops@kosmos.org'
|
||||||
license 'MIT'
|
license 'MIT'
|
||||||
description 'Installs/configures RSKj and related software'
|
description 'Installs/configures RSKj and related software'
|
||||||
version '0.4.0'
|
version '0.5.0'
|
||||||
chef_version '>= 18.2'
|
chef_version '>= 18.2'
|
||||||
issues_url 'https://gitea.kosmos.org/kosmos/chef/issues'
|
issues_url 'https://gitea.kosmos.org/kosmos/chef/issues'
|
||||||
source_url 'https://gitea.kosmos.org/kosmos/chef'
|
source_url 'https://gitea.kosmos.org/kosmos/chef'
|
||||||
|
|||||||
@@ -20,10 +20,19 @@ apt_repository 'rskj' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
apt_package 'openjdk-17-jdk'
|
apt_package 'openjdk-17-jdk'
|
||||||
|
apt_package 'debconf-utils'
|
||||||
|
|
||||||
|
execute 'preseed-rskj-license' do
|
||||||
|
command 'echo "rskj shared/accepted-rsk-license-v1-1 boolean true" | debconf-set-selections'
|
||||||
|
not_if 'debconf-get-selections | grep -q "shared/accepted-rsk-license-v1-1.*true"'
|
||||||
|
end
|
||||||
|
|
||||||
|
execute 'preseed-rskj-config' do
|
||||||
|
command "echo \"rskj shared/config select #{node['rskj']['network']}\" | debconf-set-selections"
|
||||||
|
not_if "debconf-get-selections | grep -q \"shared/config.*#{node['rskj']['network']}\""
|
||||||
|
end
|
||||||
|
|
||||||
apt_package 'rskj' do
|
apt_package 'rskj' do
|
||||||
response_file 'rskj-preseed.cfg.erb'
|
|
||||||
response_file_variables network: node['rskj']['network']
|
|
||||||
options '--assume-yes'
|
options '--assume-yes'
|
||||||
version node['rskj']['version']
|
version node['rskj']['version']
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#_preseed_V1
|
#_preseed_V1
|
||||||
# Do you agree to the terms of the applicable licenses?
|
# Do you agree to the terms of the applicable licenses?
|
||||||
rskj shared/accepted-rsk-license-v1-1 select true
|
rskj shared/accepted-rsk-license-v1-1 boolean true
|
||||||
# Choose a configuration environment to run your node.
|
# Choose a configuration environment to run your node.
|
||||||
# Choices: mainnet, testnet, regtest
|
# Choices: mainnet, testnet, regtest
|
||||||
rskj shared/config select <%= @network %>
|
rskj shared/config select <%= @network %>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ end
|
|||||||
|
|
||||||
describe package('rskj') do
|
describe package('rskj') do
|
||||||
it { should be_installed }
|
it { should be_installed }
|
||||||
its('version') { should eq '7.0.0~jammy' }
|
its('version') { should eq '9.0.1~noble' }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe service('rsk') do
|
describe service('rsk') do
|
||||||
|
|||||||
Reference in New Issue
Block a user