Ubuntu 24.04 support (#19)

* Fixing inspec

* meta update

* Disabling thefuck for now

* Fixes found during testing

* fixing a test

* Fixing test data

.kitchen.yml

@@ -32,11 +32,9 @@ transport:
   username: ubuntu
 
 platforms:
-  - name: ubuntu-18.04
   - name: ubuntu-20.04
   - name: ubuntu-22.04
-    driver:
-      image_id: ami-0515e1913cfc2801d # A private custom AMI that enables ssh-rsa keys for sshd in Vagrant.
+  - name: ubuntu-24.04
 
 suites:
   - name: standard

CHANGELOG.md

@@ -2,6 +2,12 @@ Ansible Role - ubuntu-base: Changelog
 =====================================
 A list of all the changes made to this repo, and the role it contains
 
+Version 1.4.0
+-------------
+
+1. Added Ubuntu 24.04 support
+2. Removed Ubuntu 18.04 support
+
 Version 1.3.2
 -------------
 

Gemfile

@@ -6,5 +6,5 @@ gem "kitchen-ec2"
 gem "aws-sdk-ec2"
 gem "kitchen-ansible"
 gem "kitchen-inspec"
-gem "inspec"
+gem "inspec", "< 6.0"
 gem "inspec-bin"

TODO.md

@@ -0,0 +1,5 @@
+Ansible Role - ubuntu-base: TODO
+=====================================
+A list of all the tasks to do for this repo
+
+1. Restore `thefuck` for Ubuntu 24.04+ once the maintainer fixes the package.

files/zshrc

@@ -113,11 +113,13 @@ export EDITOR=vim
 # New sessions start in ~/
 cd ~/
 
-# Make sure Vagrant uses virtualbox by default
-export VAGRANT_DEFAULT_PROVIDER=virtualbox
 
 # Enable thefuck
-eval "$(thefuck --alias)"
+#TODO remove this if statement when the package works on 24.04+
+version=$(lsb_release -rs | grep -v "No")
+if (( $(echo "$version < 24.04" | bc -l) )); then
+    eval "$(thefuck --alias)"
+fi
 
 # Help keep repos clean by deleting branches that no longer exist upstream
 git_prune()

meta/main.yml

@@ -16,13 +16,13 @@ galaxy_info:
   description: "Various tweaks and basic prerequisites for Ubuntu systems along with a fancy bash prompt"
   company: "Route 1337 LLC"
   license: "license (MIT)"
-  min_ansible_version: "2.4"
+  min_ansible_version: "2.8"
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
         - jammy
+        - noble
   galaxy_tags:
     - base
     - system

tasks/main.yml

@@ -19,6 +19,6 @@
 - import_tasks: ntp.yml
   when: ansible_distribution == 'Ubuntu'
 - import_tasks: thefuck.yml
-  when: ansible_distribution == 'Ubuntu'
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version < "24.04" #TODO fix this when the package is fixed
 - import_tasks: systemd.yml
   when: ansible_distribution == 'Ubuntu'

tasks/ntp.yml

@@ -16,6 +16,7 @@
   apt:
     name: ntp
     state: present
+  when: ansible_distribution_version < "24.04"
 
 - name: Set localtime symlink to correct TZ
   set_fact:
@@ -33,3 +34,4 @@
     name: ntp
     state: started
     enabled: yes
+  when: ansible_distribution_version < "24.04"

tasks/prereqs.yml

@@ -52,15 +52,14 @@
       - zsh
       - locate
 
-- name: (Ubuntu 20.04+) Add packages
+- name: Add packages
   apt:
     name: "{{ packages }}"
     state: present
   vars:
     packages:
       - fzf
       - ripgrep
-  when: ansible_distribution_version >= "20.04"
 
 - name: Make sure the /opt directory exists
   file:

tasks/thefuck.yml

@@ -12,11 +12,18 @@
 
 # Install thefuck, its prerequisites and our custom rules for it
 
-- name: Install thefuck
+- name: Install thefuck via pip
   pip:
     name: thefuck
     state: present
     executable: pip3
+  when: ansible_distribution_version < "24.04"
+
+- name: Install thefuck
+  apt:
+    name: thefuck
+    state: present
+  when: ansible_distribution_version >= "24.04"
 
 - name: Create root's custom thefuck rules directory
   file:

tests/host_vars/systemd/localhost.yml

@@ -17,5 +17,5 @@ ubuntu_base:
     - 8.8.8.8
     - 1.1.1.1
   search_domain: "company.internal"
-  tzsymlink: "EST"
-  localtime: "/usr/share/zoneinfo/America/New_York"
+  tzsymlink: "UTC"
+  localtime: "/usr/share/zoneinfo/UTC"

tests/smoke/repo-role/systemd/ntp_test.rb

@@ -29,7 +29,7 @@
   # Verify the localtime is set correctly
   # This is done via ls since each version of Ubuntu seems changes the final destination of the link
   describe command('ls -lh /etc/localtime') do
-    its('stdout') { should match /\/usr\/share\/zoneinfo\/America\/New_York/ }
+    its('stdout') { should match /\/usr\/share\/zoneinfo\/UTC/ }
   end
 
   # Verify the timezone file is correct
@@ -38,12 +38,12 @@
     it { should be_owned_by 'root' }
     it { should be_grouped_into 'root' }
     it { should be_mode 0644 }
-    its(:content) { should match /EST/ }
+    its(:content) { should match /UTC/ }
   end
 
   # Verify the time zone we want is active
   describe command('date +%Z') do
-    its('stdout') { should match /EST/ }
+    its('stdout') { should match /UTC/ }
   end
 
   # Verify the ntp service is running and enabled