Disk size increase, not-so-needed SSH fix

Author: smokodon

ci-ubuntu-2204.yml

@@ -29,7 +29,8 @@ builders:
   zone: us-central1-a
   image_name: "{{ user `image_name` }}"
   machine_type: n2-standard-16
-  disk_size: 50
+  # Dont go over 70 - worker won't boot the image
+  disk_size: 70
   temporary_key_pair_type: ed25519
   tags:
   - ci
@@ -147,7 +148,7 @@ provisioners:
   - packer-scripts/perforce-install
   - packer-scripts/pyenv-install
   - packer-scripts/cosign-install
-  - packer-scripts/rabbitmq-install
+  # - packer-scripts/rabbitmq-install
   - packer-scripts/updates
   - packer-scripts/test-system-info-output
   - packer-scripts/dump-dpkg-manifest
@@ -165,6 +166,10 @@ provisioners:
 #   inline: "sudo chown -R couchdb:couchdb /opt/couchdb/"  
 # - type: shell
 #   inline: "ls -lah /opt/couchdb/"
+- type: shell
+  inline: "sudo systemctl disable --now ssh.socket && sudo systemctl enable --now ssh.service && sudo systemctl daemon-reload && sudo systemctl restart ssh"
+# - type: shell
+#   inline: "sudo ssh-keygen -A && sudo dpkg-reconfigure openssh-server"
 - type: shell
   scripts:
   - packer-scripts/create-image-metadata-tarball

cookbooks/lib/languages/python_spec.rb

@@ -65,7 +65,6 @@
     }
   elsif 'jammy'.include?(Support.distro)
     vers = {
-      'python3.7' => '3.7.17',
       'python3.8' => '3.8.18',
       'python3.10' => '3.10.14',
       'python3.12' => '3.12.2'

cookbooks/travis_ci_ubuntu_2204/attributes/default.rb

@@ -8,13 +8,11 @@
   '3.12.2' => %w[3.12],
   '3.10.14' => %w[3.10],
   '3.8.18' => %w[3.8],
-  '3.7.17' => %w[3.7],
   'pypy2.7-7.3.1' => %w[pypy],
   'pypy3.6-7.3.1' => %w[pypy3],
 }
 # packages build by Cpython + our repo
 pythons = %w[
-  3.7.17
   3.8.18
   3.10.14
   3.12.2
@@ -73,7 +71,7 @@
 rubies = %w[
   2.7.8
   3.1.2
-  3.3.0
+  3.3.1
 ]
 
 override['travis_build_environment']['virtualenv']['version'] = '20.24.6'
@@ -100,9 +98,9 @@
 override['travis_build_environment']['mercurial_version'] = '6.5.2'
 override['travis_build_environment']['ibm_advanced_tool_chain_version'] = 14.0
 
-override['travis_build_environment']['packer']['amd64']['version'] = '1.11.0'
+override['travis_build_environment']['packer']['amd64']['version'] = '1.11.1'
 override['travis_build_environment']['packer']['amd64']['checksum'] = \
-'dcac06a4c671bbb71e916da5abe947ebf4d6aa35c197e21c7c7b1d68cb8b7cad'
+'07a9d92fe98d7bb4be09392c06ef6c4f9ffbc905fe6c29fff0622432367f01cc'
 
 override['travis_packer_templates']['job_board']['stack'] = 'ubuntu_2204'
 

cookbooks/travis_ci_ubuntu_2204/recipes/default.rb

@@ -52,8 +52,8 @@
 include_recipe 'travis_build_environment::lein'
 include_recipe 'travis_sbt_extras'
 include_recipe 'travis_build_environment::gradle'
-# include_recipe 'travis_postgresql'
-# include_recipe 'travis_build_environment::mysql'
+include_recipe '::mysql'
+include_recipe '::postgresql'
 include_recipe 'travis_perlbrew::multi'
 include_recipe 'travis_build_environment::redis'
 include_recipe 'memcached'

cookbooks/travis_ci_ubuntu_2204/recipes/postgresql.rb

@@ -8,8 +8,6 @@
 end
 
 package 'postgresql-14'
-  action :install
-end
 
 service 'postgresql' do
   action [:stop, :disable]
@@ -25,7 +23,3 @@
 execute 'change_log_dir_permissions' do
   command 'sudo chmod -R 777 /var/log/postgresql'
 end
-
-apt_repository 'postgresql' do
-  action :remove
-end

packer-scripts/pre-chef-bootstrap-jammy

@@ -40,9 +40,9 @@ __install_packages() {
       /var/lib/apt/lists/*
   fi
 
-  apt-get update -yqq
-  apt-get upgrade -y
-  apt-get install -yqq \
+  apt update -yqq
+  apt full-upgrade -y
+  apt install -yqq \
     --no-install-suggests \
     --no-install-recommends \
     ca-certificates \

packer-scripts/updates

@@ -5,13 +5,7 @@ set -o xtrace
 
 main() {
 
-   echo "Appling main updates"
-
-   apt-get update -yqq
-   # apt full-upgrade -y
-   # apt install linux-headers-generic -y
-   # apt-get autoremove -y
-   # apt-get clean -y
+   apt install linux-headers-generic -y
 
    echo "Installing pip-review"
 
@@ -39,7 +33,7 @@ main() {
 
    # Update bundler
    gem install bundler
-
+   
 }
 
 main "$@"