Migrate salt-master to Ubuntu 22.04('Jammy')

Vagrantfile

@@ -7,7 +7,7 @@ SERVERS = [
   "buildbot",
   "cdn-logs",
   "codespeed",
-  "consul",
+  {:name => "consul", :codename => "jammy"},
   "docs",
   "downloads",
   "hg",
@@ -40,11 +40,10 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define "salt-master" do |s_config|
-    # Uncomment below to migrate salt-master to jammy
-    # s_config.vm.provider "docker" do |docker, override|
-    #   docker.build_dir = "dockerfiles"
-    #   docker.dockerfile = "Dockerfile.jammy"
-    # end
+     s_config.vm.provider "docker" do |docker, override|
+       docker.build_dir = "dockerfiles"
+       docker.dockerfile = "Dockerfile.jammy"
+     end
 
     s_config.vm.hostname = "salt-master.vagrant.psf.io"
     s_config.vm.network "private_network", ip: MASTER1

conf/vagrant/master.conf

@@ -4,6 +4,8 @@ failhard: True
 
 extension_modules: srv/salt/_extensions
 
+user: root
+
 pillar_roots:
   base:
     - /srv/pillar/dev

dockerfiles/Dockerfile.jammy

@@ -47,9 +47,8 @@ EXPOSE 22
 RUN /usr/sbin/sshd
 
 # Setup Salt Common
-
-RUN wget --quiet -O /etc/apt/keyrings/SALT-PROJECT-GPG-PUBKEY-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/22.04/$(dpkg --print-architecture)/SALT-PROJECT-GPG-PUBKEY-2023.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/SALT-PROJECT-GPG-PUBKEY-2023.gpg arch=$(dpkg --print-architecture)] https://repo.saltproject.io/salt/py3/ubuntu/22.04/$(dpkg --print-architecture)/3006 jammy main" > /etc/apt/sources.list.d/saltstack.list
+RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/22.04/$(dpkg --print-architecture)/SALT-PROJECT-GPG-PUBKEY-2023.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=$(dpkg --print-architecture)] https://repo.saltproject.io/salt/py3/ubuntu/22.04/$(dpkg --print-architecture)/3006 jammy main" > /etc/apt/sources.list.d/salt.list
 RUN apt-get update -y && apt-get install -y --no-install-recommends salt-minion
 
 # Start Systemd (systemctl)

salt/base/repo.sls

@@ -7,9 +7,10 @@
 
 psf:
   pkgrepo.managed:
-    - name: "deb https://packagecloud.io/psf/infra/ubuntu {{ grains['oscodename'] }} main"
+    - name: "deb [signed-by=/etc/apt/keyrings/packagecloud.gpg arch={{ grains["osarch"] }}] https://packagecloud.io/psf/infra/ubuntu {{ grains['oscodename'] }} main"
     - file: /etc/apt/sources.list.d/psf.list
     - key_url: salt://base/config/APT-GPG-KEY-PSF
+    - aptkey: False
 
 # Make source list globally readable.
 /etc/apt/sources.list.d/psf.list:

salt/base/salt.sls

@@ -6,6 +6,16 @@ python-requests:
 python-msgpack:
   pkg.latest:
     - name: python3-msgpack
+
+{% elif grains["oscodename"] == "jammy" %}
+python-requests:
+  pkg.latest:
+    - name: python3-requests
+
+python-msgpack:
+  pkg.latest:
+    - name: python3-msgpack
+
 {% else %}
 python-requests:
   pkg.latest
@@ -24,6 +34,11 @@ salt-2018.3:
     {% if grains["oscodename"] == "focal" %}
     - name: deb https://archive.repo.saltproject.io/py3/ubuntu/20.04/{{ grains["osarch"] }}/archive/3004 focal main
     - key_url: https://archive.repo.saltproject.io/py3/ubuntu/20.04/{{ grains["osarch"] }}/archive/3004/salt-archive-keyring.gpg
+    {% elif grains["oscodename"] == "jammy" %}
+    - name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch={{ grains["osarch"] }}] https://repo.saltproject.io/salt/py3/ubuntu/22.04/{{ grains["osarch"] }}/latest jammy main
+    - file: /etc/apt/sources.list.d/salt.list
+    - key_url: https://repo.saltproject.io/salt/py3/ubuntu/22.04/{{ grains["osarch"] }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg
+    - aptkey: False
     {% else %}
     - name: deb http://archive.repo.saltstack.com/py3/ubuntu/{{ grains["osrelease"] }}/{{ grains["osarch"] }}/2018.3 {{ grains["oscodename"] }} main
     - key_url: https://archive.repo.saltstack.com/py3/ubuntu/18.04/amd64/2018.3/SALTSTACK-GPG-KEY.pub

salt/datadog/init.sls

@@ -1,8 +1,9 @@
 datadog_repo:
   pkgrepo.managed:
-    - name: "deb https://apt.datadoghq.com stable 6"
+    - name: "deb [signed-by=/etc/apt/keyrings/datadoghq.gpg arch={{ grains["osarch"] }}]  https://apt.datadoghq.com stable 6"
     - file: /etc/apt/sources.list.d/datadog.list
     - key_url: salt://datadog/config/APT-GPG-KEY-DATADOG
+    - aptkey: False
 
 {% set in_datadog_tags = pillar.get('datadog_tags', []) + grains.get('datadog_tags', []) + grains.get('datadog_tags_from_metadata', []) %}
 {% set datadog_tags = [] %}

salt/nginx/init.sls

@@ -1,8 +1,9 @@
 nginx:
   pkgrepo.managed:
-    - name: deb http://nginx.org/packages/ubuntu {{ grains.oscodename }} nginx
+    - name: deb [signed-by=/etc/apt/keyrings/nginx.gpg arch={{ grains["osarch"] }}] http://nginx.org/packages/ubuntu {{ grains.oscodename }} nginx
     - file: /etc/apt/sources.list.d/nginx.list
     - key_url: salt://nginx/config/APT-GPG-KEY-NGINX
+    - aptkey: False
     - order: 2
     - require_in:
       - pkg: nginx