Merge "Stop adding duplicate OpenAFS PPA on executors"

playbooks/roles/zuul-executor/tasks/main.yaml

@@ -1,20 +1,3 @@
-- name: Include OS-specific variables
-  include_vars: "{{ lookup('first_found', params) }}"
-  vars:
-    params:
-      files: "{{ distro_lookup_path }}"
-      paths:
-        - 'vars'
-
-- name: Install PPAs
-  include_role:
-    name: install-apt-repo
-  vars:
-    repo_name: "{{ item.name }}"
-    repo_key: "{{ item.key }}"
-    repo_content: "{{ item.content }}"
-  loop: '{{ zuul_executor_ppas }}'
-
 - name: Write key for talking to nodepool nodes
   copy:
     content: '{{ nodepool_test_node_ssh_private_key_contents }}'

playbooks/roles/zuul-executor/vars/Ubuntu.focal.yaml

@@ -1,6 +0,0 @@
-zuul_executor_ppas:
-  # We use later HWE kernels for better memory managment, requiring an
-  # updated AFS version which we install from our custom ppa.
-  - name: openafs
-    content: "deb http://ppa.launchpad.net/openstack-ci-core/openafs/ubuntu focal main"
-    key: "{{ openstack_ci_core_ppa_key }}"

playbooks/roles/zuul-executor/vars/Ubuntu.jammy.yaml

@@ -1,6 +0,0 @@
-zuul_executor_ppas:
-  # We use later HWE kernels for better memory managment, requiring an
-  # updated AFS version which we install from our custom ppa.
-  - name: openafs
-    content: "deb http://ppa.launchpad.net/openstack-ci-core/openafs/ubuntu jammy main"
-    key: "{{ openstack_ci_core_ppa_key }}"

playbooks/roles/zuul-executor/vars/default.yaml

@@ -1,6 +0,0 @@
-zuul_executor_ppas:
-  # We use later HWE kernels for better memory managment, requiring an
-  # updated AFS version which we install from our custom ppa.
-  - name: openafs
-    content: "deb http://ppa.launchpad.net/openstack-ci-core/openafs-amd64-hwe/ubuntu xenial main"
-    key: "{{ openstack_ci_core_ppa_key }}"

playbooks/roles/zuul-executor/vars/main.yaml

@@ -1,30 +0,0 @@
-openstack_ci_core_ppa_key: |
-  -----BEGIN PGP PUBLIC KEY BLOCK-----
-  Version: GnuPG v1
-
-  mQINBFUZtK8BEADGaOXCZ/ypqcNEU5Y3rospyaJDhi9PiLndRXz6KxZEoDljmaLz
-  QBMiJ3/lnNflwcv07sBdQDqBjNClFdDbvP4ttIZsQzWYQya/uHzM3rNxbh2bw24T
-  z0n/+PwZ10NrGFIoXl9rU79tXe7XTJDifYvEXtpwnNcgo6/j3FJ9l7q9jQO4SwbK
-  4dxKRLnwxPLsOtspvSp6J0PC9j6TiPYTrQ8dp8mj05GFF7oK6ZlQAJ3lgYG/QaWA
-  9rXF1bOMw7E/arMI4+WYQOhx+JHkCitkai000MdNRVykrvJD/r9pb6NSzyAIrs/h
-  DYvRjD/+7d2pd47R0CLTQJjsT9JNDlZqpU7i6+47zAB9uYTVJFprNF7/BuQ84fK/
-  o81ePwutt+gfGzhKvbjUNLUC6WxFzojZEDbixz0TUOgvjUsK4VGoDyxLw1YLebjs
-  5YdGROB19+771sx6leMZpdQhiTaXWlQrTyjbiS7f71Hx2Eng4hpyrySzHbBrLzXq
-  XjiMazxt1yp5qq3VEBBgb6iW1ejDihkew1dnx+IJbUJ+OCs8Exntdta9B5+gg557
-  Q6egbxQBK3RZ/c+8JHR1ROZ63COQXtAyfTsWwyxcfm7OI0YkNkJ2gNkeMl3spKw4
-  VbGgaC0WBGKsdhVd9TfvtssBItS5/bgnIob/3aOFyCmNH33SGCjYDeopPQARAQAB
-  tCNMYXVuY2hwYWQgUFBBIGZvciBPcGVuU3RhY2sgQ0kgQ29yZYkCOAQTAQIAIgUC
-  VRm0rwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQFbbOfAGNBfUyCA/+
-  OJEojrft6vxgh3iVDlDan1NavVm4D7F1mgfRlFwd9BC3trUkaLrNAqHXTi0fWtLe
-  CqD3k0UAekA+0e58AL5EjeGyCadn9TT7oWlaXgiPr9OHCaVV/z8DnalQny31PQhf
-  weNOVyOMKh/o7BFaLc3i5KCU+qb/gAcCRC7tLI8Saxf2CzboA6tECr8CHxX9xHln
-  pspbcw5aAnEfpqd6BTagkkMjJ/+tDhC4pv9USwH3lbBjRlU93miuqoqtooMd++yy
-  AKYd9c8ClRuI33rIAdoAmFfwwqk2prb9fF0BTxvfGdENZ+isOjvYTjzz0cYdBDrx
-  fZtl7ruYceC54/6Nt9aKX0ADJBJuiIcNjqgaNCjdBP/p7aCIJzh10GKeDIzitCrK
-  /ikMWcszaqYtctBVQvRxGfF2MSAy/VJny0OhiQI6XVc6eK/9Iu9ZeEAC6GoQRIla
-  rwYit+TGhqgYBKYTjWwVlKUZAz7GCIF+wx+NTkUTWVQTnDzTFeBVbzGx3WHQhCqF
-  NayXtKHrdImKfVpQjZZBVo42HzKqfGt/kNDM6IKhIuMlqlCUimVZpc3tawb+d8QT
-  TS0IjLrW7dpFfRaZRk82AjQOp96WJL9LoDvcEIfKg7RKmcGPBJ2qaquj+PA6yAZL
-  5pX70jigBqjtJ0PZGm7jELb8bB70SVSGsvwHmEz0pSs=
-  =cc1L
-  -----END PGP PUBLIC KEY BLOCK-----