Skip to content

Commit d2d1c37

Browse files
committed
Image fixes, syntax update, SSH important fix
1 parent 3cd8b65 commit d2d1c37

File tree

7 files changed

+76
-104
lines changed

7 files changed

+76
-104
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install:
3030
fi
3131
- export GIT_DESC="$(git describe --always --dirty --tags)"
3232
- rvm use 2.7.4 --install --binary --fuzzy
33-
- gem install bundler:2.2.27
33+
- gem install bundler:2.5.13
3434
- bundle install --jobs=3 --retry=2 --path=vendor/bundle
3535
- ./bin/packer-build-install
3636
- ln -sv "${TRAVIS_BUILD_DIR}" "${TRAVIS_BUILD_DIR}/tmp/packer-chef-local"

Gemfile.lock

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@ GIT
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
activesupport (5.2.6)
13+
activesupport (5.2.8.1)
1414
concurrent-ruby (~> 1.0, >= 1.0.2)
1515
i18n (>= 0.7, < 2)
1616
minitest (~> 5.1)
1717
tzinfo (~> 1.1)
18-
addressable (2.8.0)
19-
public_suffix (>= 2.0.2, < 5.0)
18+
addressable (2.8.6)
19+
public_suffix (>= 2.0.2, < 6.0)
2020
ast (2.4.2)
2121
coderay (1.1.3)
22-
concurrent-ruby (1.1.9)
23-
diff-lcs (1.4.4)
22+
concurrent-ruby (1.3.3)
23+
diff-lcs (1.5.1)
2424
docile (1.4.0)
2525
erubis (2.7.0)
26-
faraday (0.17.4)
26+
faraday (0.17.6)
2727
multipart-post (>= 1.2, < 3)
2828
faraday_middleware (0.14.0)
2929
faraday (>= 0.7.4, < 1.0)
30-
ffi-yajl (2.4.0)
30+
ffi-yajl (2.6.0)
3131
libyajl2 (>= 1.2)
3232
foodcritic (16.3.0)
3333
erubis
@@ -44,73 +44,81 @@ GEM
4444
multi_json (~> 1.0)
4545
net-http-persistent (~> 2.9)
4646
net-http-pipeline
47-
git (1.9.1)
47+
git (1.19.1)
48+
addressable (~> 2.8)
4849
rchardet (~> 1.8)
49-
i18n (1.8.10)
50+
i18n (1.14.5)
5051
concurrent-ruby (~> 1.0)
52+
json (2.7.2)
53+
language_server-protocol (3.17.0.3)
5154
libyajl2 (2.1.0)
52-
method_source (1.0.0)
53-
mini_portile2 (2.6.1)
54-
minitest (5.14.4)
55+
method_source (1.1.0)
56+
mini_portile2 (2.8.7)
57+
minitest (5.23.1)
5558
multi_json (1.15.0)
56-
multipart-post (2.1.1)
59+
multipart-post (2.4.1)
5760
net-http-persistent (2.9.4)
5861
net-http-pipeline (1.0.1)
59-
nokogiri (1.12.5)
60-
mini_portile2 (~> 2.6.1)
62+
nokogiri (1.16.6)
63+
mini_portile2 (~> 2.8.2)
6164
racc (~> 1.4)
62-
parallel (1.21.0)
63-
parser (3.0.2.0)
65+
parallel (1.25.1)
66+
parser (3.3.3.0)
6467
ast (~> 2.4.1)
68+
racc
6569
polyglot (0.3.5)
66-
pry (0.14.1)
70+
pry (0.14.2)
6771
coderay (~> 1.1)
6872
method_source (~> 1.0)
69-
public_suffix (4.0.6)
70-
racc (1.6.0)
71-
rainbow (3.0.0)
72-
rake (13.0.6)
73+
public_suffix (5.1.1)
74+
racc (1.8.0)
75+
rainbow (3.1.1)
76+
rake (13.2.1)
7377
rchardet (1.8.0)
74-
regexp_parser (2.1.1)
75-
rexml (3.2.5)
76-
rspec (3.10.0)
77-
rspec-core (~> 3.10.0)
78-
rspec-expectations (~> 3.10.0)
79-
rspec-mocks (~> 3.10.0)
80-
rspec-core (3.10.1)
81-
rspec-support (~> 3.10.0)
82-
rspec-expectations (3.10.1)
78+
regexp_parser (2.9.2)
79+
rexml (3.3.0)
80+
strscan
81+
rspec (3.13.0)
82+
rspec-core (~> 3.13.0)
83+
rspec-expectations (~> 3.13.0)
84+
rspec-mocks (~> 3.13.0)
85+
rspec-core (3.13.0)
86+
rspec-support (~> 3.13.0)
87+
rspec-expectations (3.13.1)
8388
diff-lcs (>= 1.2.0, < 2.0)
84-
rspec-support (~> 3.10.0)
85-
rspec-mocks (3.10.2)
89+
rspec-support (~> 3.13.0)
90+
rspec-mocks (3.13.1)
8691
diff-lcs (>= 1.2.0, < 2.0)
87-
rspec-support (~> 3.10.0)
88-
rspec-support (3.10.2)
89-
rubocop (1.22.3)
92+
rspec-support (~> 3.13.0)
93+
rspec-support (3.13.1)
94+
rubocop (1.64.1)
95+
json (~> 2.3)
96+
language_server-protocol (>= 3.17.0)
9097
parallel (~> 1.10)
91-
parser (>= 3.0.0.0)
98+
parser (>= 3.3.0.2)
9299
rainbow (>= 2.2.2, < 4.0)
93100
regexp_parser (>= 1.8, < 3.0)
94-
rexml
95-
rubocop-ast (>= 1.12.0, < 2.0)
101+
rexml (>= 3.2.5, < 4.0)
102+
rubocop-ast (>= 1.31.1, < 2.0)
96103
ruby-progressbar (~> 1.7)
97-
unicode-display_width (>= 1.4.0, < 3.0)
98-
rubocop-ast (1.12.0)
99-
parser (>= 3.0.1.1)
100-
ruby-progressbar (1.11.0)
104+
unicode-display_width (>= 2.4.0, < 3.0)
105+
rubocop-ast (1.31.3)
106+
parser (>= 3.3.1.0)
107+
ruby-progressbar (1.13.0)
101108
rufus-lru (1.1.0)
102-
simplecov (0.21.2)
109+
simplecov (0.22.0)
103110
docile (~> 1.1)
104111
simplecov-html (~> 0.11)
105112
simplecov_json_formatter (~> 0.1)
106113
simplecov-html (0.12.3)
107-
simplecov_json_formatter (0.1.3)
114+
simplecov_json_formatter (0.1.4)
115+
strscan (3.1.0)
108116
thread_safe (0.3.6)
109-
treetop (1.6.11)
117+
treetop (1.6.12)
110118
polyglot (~> 0.3)
111-
tzinfo (1.2.9)
119+
tzinfo (1.2.11)
112120
thread_safe (~> 0.1)
113-
unicode-display_width (2.1.0)
121+
unicode-display_width (2.5.0)
114122

115123
PLATFORMS
116124
ruby
@@ -124,4 +132,4 @@ DEPENDENCIES
124132
travis-packer-build!
125133

126134
BUNDLED WITH
127-
2.1.4
135+
2.5.3

cookbooks/travis_ci_ubuntu_2204/attributes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181

8282
# changing default ruby version due to dpl issues
83-
override['travis_build_environment']['default_ruby'] = '3.3.0'
83+
override['travis_build_environment']['default_ruby'] = '3.3.1'
8484
override['travis_build_environment']['rubies'] = rubies
8585

8686
override['travis_build_environment']['otp_releases'] = %w[

packer-scripts/cleanup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ set -o xtrace
55
shopt -s nullglob
66

77
# clear the APT cache and delete everything from /var/cache/apt/archives/
8+
# removed /etc/ssh/ssh_host_* \ - this probably caused issues with ssh connection for some reason..
89
apt clean
910

1011
rm -rf \
1112
/etc/apparmor* \
1213
/etc/profile.d/jdk.csh \
1314
/etc/profile.d/jdk.sh \
14-
/etc/ssh/ssh_host_* \
1515
/lib/recovery-mode \
1616
/opt/chef* \
1717
/tmp/* \

packer-scripts/rabbitmq-install

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,9 @@
11
#!/bin/bash
22

3-
sudo apt-get install curl gnupg apt-transport-https -y
4-
5-
## Team RabbitMQ's main signing key
6-
curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/com.rabbitmq.team.gpg > /dev/null
7-
## Community mirror of Cloudsmith: modern Erlang repository
8-
curl -1sLf https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key | sudo gpg --dearmor | sudo tee /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg > /dev/null
9-
## Community mirror of Cloudsmith: RabbitMQ repository
10-
curl -1sLf https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key | sudo gpg --dearmor | sudo tee /usr/share/keyrings/rabbitmq.9F4587F226208342.gpg > /dev/null
11-
12-
## Add apt repositories maintained by Team RabbitMQ
13-
sudo tee /etc/apt/sources.list.d/rabbitmq.list <<EOF
14-
## Provides modern Erlang/OTP releases
15-
##
16-
deb [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main
17-
deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main
18-
19-
# another mirror for redundancy
20-
deb [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main
21-
deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main
22-
23-
## Provides RabbitMQ
24-
##
25-
deb [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main
26-
deb-src [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main
27-
28-
# another mirror for redundancy
29-
deb [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main
30-
deb-src [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main
31-
EOF
32-
33-
## Update package indices
34-
sudo apt-get update -y
35-
36-
## Install Erlang packages
37-
sudo apt-get install -y erlang-base \
38-
erlang-asn1 erlang-crypto erlang-eldap erlang-ftp erlang-inets \
39-
erlang-mnesia erlang-os-mon erlang-parsetools erlang-public-key \
40-
erlang-runtime-tools erlang-snmp erlang-ssl \
41-
erlang-syntax-tools erlang-tftp erlang-tools erlang-xmerl
42-
43-
## Install rabbitmq-server and its dependencies
44-
sudo apt-get install rabbitmq-server -y --fix-missing
3+
sudo apt remove --purge rabbitmq-server erlang*
4+
curl -1sLf 'https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/setup.deb.sh' | sudo -E bash
5+
sudo apt update -y
6+
sudo apt install --upgrade erlang -y
7+
wget https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.13.3/rabbitmq-server_3.13.3-1_all.deb
8+
sudo dpkg -i rabbitmq-server_3.13.3-1_all.deb
9+
rm rabbitmq-server_3.13.3-1_all.deb

packer-scripts/run-serverspecs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ __install_chef() {
5050
return
5151
fi
5252

53-
curl -sSL https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef-workstation -v 21.10.640
53+
curl -sSL https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef-workstation -v 22.5.923
5454
__run_retry 2 30 apt-get update -y
5555
__run_retry 2 30 apt-get install libc-client2007e-dev mysql-client
5656

@@ -119,10 +119,6 @@ unset GEM_PATH
119119
cd ${cookbook_dir}
120120
sudo systemctl start xvfb.service
121121
set -o errexit
122-
chef exec rspec ${SPEC_ARGS} \\
123-
--format documentation \\
124-
--format json \\
125-
--out /home/travis/.${suite}_rspec.json
126122
"
127123

128124
local exit_code="$?"

packer-scripts/updates

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ main() {
88
echo "Appling main updates"
99

1010
apt-get update -yqq
11-
apt full-upgrade -y
12-
apt install linux-headers-generic -y
13-
apt-get autoremove -y
14-
apt-get clean -y
11+
# apt full-upgrade -y
12+
# apt install linux-headers-generic -y
13+
# apt-get autoremove -y
14+
# apt-get clean -y
1515

1616
echo "Installing pip-review"
1717

1818
# wget https://bootstrap.pypa.io/get-pip.py
1919
# sudo python3 get-pip.py
20-
pip install --upgrade pip pyopenssl certifi rsa pytest oauthlib testresources setuptools dbus-python numpy pip-review
20+
pip install --upgrade pip pyopenssl certifi rsa pytest oauthlib testresources setuptools numpy pip-review
2121
pip-review --auto
2222

2323
echo "Appling docker buildx fix"
@@ -37,6 +37,9 @@ main() {
3737
# Update composer
3838
/home/travis/.phpenv/shims/composer self-update
3939

40+
# Update bundler
41+
gem install bundler
42+
4043
}
4144

4245
main "$@"

0 commit comments

Comments
 (0)