Skip to content

Commit 23fcf3b

Browse files
committed
Jammy image updates, SSH fix
1 parent d2d1c37 commit 23fcf3b

File tree

7 files changed

+14
-27
lines changed

7 files changed

+14
-27
lines changed

ci-ubuntu-2204.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ builders:
2929
zone: us-central1-a
3030
image_name: "{{ user `image_name` }}"
3131
machine_type: n2-standard-16
32-
disk_size: 50
32+
disk_size: 80
3333
temporary_key_pair_type: ed25519
3434
tags:
3535
- ci
@@ -147,7 +147,7 @@ provisioners:
147147
- packer-scripts/perforce-install
148148
- packer-scripts/pyenv-install
149149
- packer-scripts/cosign-install
150-
- packer-scripts/rabbitmq-install
150+
# - packer-scripts/rabbitmq-install
151151
- packer-scripts/updates
152152
- packer-scripts/test-system-info-output
153153
- packer-scripts/dump-dpkg-manifest
@@ -165,6 +165,8 @@ provisioners:
165165
# inline: "sudo chown -R couchdb:couchdb /opt/couchdb/"
166166
# - type: shell
167167
# inline: "ls -lah /opt/couchdb/"
168+
- type: shell
169+
inline: "sudo ssh-keygen -A && sudo dpkg-reconfigure openssh-server && sudo cat /etc/ssh/sshd_config"
168170
- type: shell
169171
scripts:
170172
- packer-scripts/create-image-metadata-tarball

cookbooks/lib/languages/python_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
}
6666
elsif 'jammy'.include?(Support.distro)
6767
vers = {
68-
'python3.7' => '3.7.17',
6968
'python3.8' => '3.8.18',
7069
'python3.10' => '3.10.14',
7170
'python3.12' => '3.12.2'

cookbooks/travis_ci_ubuntu_2204/attributes/default.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
'3.12.2' => %w[3.12],
99
'3.10.14' => %w[3.10],
1010
'3.8.18' => %w[3.8],
11-
'3.7.17' => %w[3.7],
1211
'pypy2.7-7.3.1' => %w[pypy],
1312
'pypy3.6-7.3.1' => %w[pypy3],
1413
}
1514
# packages build by Cpython + our repo
1615
pythons = %w[
17-
3.7.17
1816
3.8.18
1917
3.10.14
2018
3.12.2
@@ -73,7 +71,7 @@
7371
rubies = %w[
7472
2.7.8
7573
3.1.2
76-
3.3.0
74+
3.3.1
7775
]
7876

7977
override['travis_build_environment']['virtualenv']['version'] = '20.24.6'
@@ -100,9 +98,9 @@
10098
override['travis_build_environment']['mercurial_version'] = '6.5.2'
10199
override['travis_build_environment']['ibm_advanced_tool_chain_version'] = 14.0
102100

103-
override['travis_build_environment']['packer']['amd64']['version'] = '1.11.0'
101+
override['travis_build_environment']['packer']['amd64']['version'] = '1.11.1'
104102
override['travis_build_environment']['packer']['amd64']['checksum'] = \
105-
'dcac06a4c671bbb71e916da5abe947ebf4d6aa35c197e21c7c7b1d68cb8b7cad'
103+
'07a9d92fe98d7bb4be09392c06ef6c4f9ffbc905fe6c29fff0622432367f01cc'
106104

107105
override['travis_packer_templates']['job_board']['stack'] = 'ubuntu_2204'
108106

cookbooks/travis_ci_ubuntu_2204/recipes/default.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
include_recipe 'travis_build_environment::lein'
5353
include_recipe 'travis_sbt_extras'
5454
include_recipe 'travis_build_environment::gradle'
55-
# include_recipe 'travis_postgresql'
56-
# include_recipe 'travis_build_environment::mysql'
55+
include_recipe '::mysql'
56+
include_recipe '::postgresql'
5757
include_recipe 'travis_perlbrew::multi'
5858
include_recipe 'travis_build_environment::redis'
5959
include_recipe 'memcached'

cookbooks/travis_ci_ubuntu_2204/recipes/postgresql.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
end
99

1010
package 'postgresql-14'
11-
action :install
12-
end
1311

1412
service 'postgresql' do
1513
action [:stop, :disable]
@@ -25,7 +23,3 @@
2523
execute 'change_log_dir_permissions' do
2624
command 'sudo chmod -R 777 /var/log/postgresql'
2725
end
28-
29-
apt_repository 'postgresql' do
30-
action :remove
31-
end

packer-scripts/pre-chef-bootstrap-jammy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ __install_packages() {
4040
/var/lib/apt/lists/*
4141
fi
4242

43-
apt-get update -yqq
44-
apt-get upgrade -y
45-
apt-get install -yqq \
43+
apt update -yqq
44+
apt full-upgrade -y
45+
apt install -yqq \
4646
--no-install-suggests \
4747
--no-install-recommends \
4848
ca-certificates \

packer-scripts/updates

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ set -o xtrace
55

66
main() {
77

8-
echo "Appling main updates"
9-
10-
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
8+
apt install linux-headers-generic -y
159

1610
echo "Installing pip-review"
1711

@@ -39,7 +33,7 @@ main() {
3933

4034
# Update bundler
4135
gem install bundler
42-
36+
4337
}
4438

4539
main "$@"

0 commit comments

Comments
 (0)