Skip to content

Commit 86596c0

Browse files
taylorifictaylorific
committed
Use latest fb_apt repo specification
1 parent fdbc96a commit 86596c0

File tree

4 files changed

+78
-141
lines changed

4 files changed

+78
-141
lines changed

‎cookbooks/boxcutter_ros/kitchen.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ verifier:
3838
platforms:
3939
# @see https://github.com/chef-cookbooks/testing_examples/blob/main/kitchen.dokken.yml
4040
# @see https://hub.docker.com/u/dokken
41-
- name: ubuntu-20.04
42-
driver:
43-
image: boxcutter/dokken-ubuntu-20.04
44-
pid_one_command: /bin/systemd
45-
4641
- name: ubuntu-22.04
4742
driver:
4843
image: boxcutter/dokken-ubuntu-22.04

‎cookbooks/boxcutter_ros/recipes/common.rb‎

Lines changed: 39 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -22,73 +22,47 @@
2222

2323
case node['platform']
2424
when 'ubuntu'
25-
# For now, continue to publish keys installable by apt-key, so we don't have
26-
# to change fb_apt yet. apt-key is not going away until after Ubuntu 22.04.
27-
# Hopefully Facebook will accommodate fb_apt to work without apt-key so we
28-
# don't have to do it.
29-
#
30-
# To get the information needed from a gpg key, download it to a temporary
31-
# ubuntu install:
32-
#
33-
# curl -fsSLO https://github.com/ros/rosdistro/raw/refs/heads/master/ros.key
34-
#
35-
# List the key with `gpg --show-keys` like so:
36-
#
37-
# gpg --with-fingerprint --show-keys ros.key
38-
#
39-
# On 2023-11-05 show-keys looked like this:
40-
#
41-
# pub rsa4096 2019-05-30 [SC] [expires: 2025-06-01]
42-
# C1CF 6E31 E6BA DE88 68B1 72B4 F42E D6FB AB17 C654
43-
# uid Open Robotics <info@osrfoundation.org>
44-
#
45-
# Use the last 16 digits of the key signature as the key for
46-
# node.default['fb_apt']['keys']:
47-
#
48-
# F42E D6FB AB17 C654
49-
#
50-
# To dump the key contents, run:
51-
#
52-
# gpg --enarmor < ros.key > ros.txt
53-
#
54-
# Then replace the GPG armored blocks with the following markers (content
55-
# remains the same:
56-
# -----BEGIN PGP PUBLIC KEY BLOCK-----
57-
# -----END PGP PUBLIC KEY BLOCK-----
58-
node.default['fb_apt']['keys']['F42ED6FBAB17C654'] = <<-EOS
59-
-----BEGIN PGP PUBLIC KEY BLOCK-----
25+
node.default['fb_apt']['sources']['ros'] = {
26+
'key' => 'ros',
27+
'url' => node['boxcutter_ros']['mirror'],
28+
'suite' => node['lsb']['codename'],
29+
'components' => ['main'],
30+
}
6031

61-
mQINBFzvJpYBEADY8l1YvO7iYW5gUESyzsTGnMvVUmlV3XarBaJz9bGRmgPXh7jc
62-
VFrQhE0L/HV7LOfoLI9H2GWYyHBqN5ERBlcA8XxG3ZvX7t9nAZPQT2Xxe3GT3tro
63-
u5oCR+SyHN9xPnUwDuqUSvJ2eqMYb9B/Hph3OmtjG30jSNq9kOF5bBTk1hOTGPH4
64-
K/AY0jzT6OpHfXU6ytlFsI47ZKsnTUhipGsKucQ1CXlyirndZ3V3k70YaooZ55rG
65-
aIoAWlx2H0J7sAHmqS29N9jV9mo135d+d+TdLBXI0PXtiHzE9IPaX+ctdSUrPnp+
66-
TwR99lxglpIG6hLuvOMAaxiqFBB/Jf3XJ8OBakfS6nHrWH2WqQxRbiITl0irkQoz
67-
pwNEF2Bv0+Jvs1UFEdVGz5a8xexQHst/RmKrtHLct3iOCvBNqoAQRbvWvBhPjO/p
68-
V5cYeUljZ5wpHyFkaEViClaVWqa6PIsyLqmyjsruPCWlURLsQoQxABcL8bwxX7UT
69-
hM6CtH6tGlYZ85RIzRifIm2oudzV5l+8oRgFr9yVcwyOFT6JCioqkwldW52P1pk/
70-
/SnuexC6LYqqDuHUs5NnokzzpfS6QaWfTY5P5tz4KHJfsjDIktly3mKVfY0fSPVV
71-
okdGpcUzvz2hq1fqjxB6MlB/1vtk0bImfcsoxBmF7H+4E9ZN1sX/tSb0KQARAQAB
72-
tCZPcGVuIFJvYm90aWNzIDxpbmZvQG9zcmZvdW5kYXRpb24ub3JnPokCVAQTAQgA
73-
PgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBMHPbjHmut6IaLFytPQu1vur
74-
F8ZUBQJgsdhRBQkLTMW7AAoJEPQu1vurF8ZUTMwP/3f7EkOPIFjUdRmpNJ2db4iB
75-
RQu5b2SJRG+KIdbvQBzKUBMV6/RUhEDPjhXZI3zDevzBewvAMKkqs2Q1cWo9WV7Z
76-
PyTkvSyey/Tjn+PozcdvzkvrEjDMftIk8E1WzLGq7vnPLZ1q/b6Vq4H373Z+EDWa
77-
DaDwW72CbCBLWAVtqff80CwlI2x8fYHKr3VBUnwcXNHR4+nRABfAWnaU4k+oTshC
78-
Qucsd8vitNfsSXrKuKyz91IRHRPnJjx8UvGU4tRGfrHkw1505EZvgP02vXeRyWBR
79-
fKiL1vGy4tCSRDdZO3ms2J2m08VPv65HsHaWYMnO+rNJmMZj9d9JdL/9GRf5F6U0
80-
quoIFL39BhUEvBynuqlrqistnyOhw8W/IQy/ymNzBMcMz6rcMjMwhkgm/LNXoSD1
81-
1OrJu4ktQwRhwvGVarnB8ihwjsTxZFylaLmFSfaA+OAlOqCLS1OkIVMzjW+Ul6A6
82-
qjiCEUOsnlf4CGlhzNMZOx3low6ixzEqKOcfECpeIj80a2fBDmWkcAAjlHu6VBhA
83-
TUDG9e2xKLzV2Z/DLYsb3+n9QW7KO0yZKfiuUo6AYboAioQKn5jh3iRvjGh2Ujpo
84-
22G+oae3PcCc7G+z12j6xIY709FQuA49dA2YpzMda0/OX4LP56STEveDRrO+CnV6
85-
WE+F5FaIKwb72PL4rLi4
86-
=i0tj
87-
-----END PGP PUBLIC KEY BLOCK-----
32+
# curl -fsSLO https://github.com/ros/rosdistro/raw/refs/heads/master/ros.key
33+
# gpg --enarmor < ros.key > ros.asc
34+
node.default['fb_apt']['keymap']['ros'] = <<~EOS
35+
-----BEGIN PGP ARMORED FILE-----
36+
Comment: Use "gpg --dearmor" for unpacking
37+
38+
mQINBFzvJpYBEADY8l1YvO7iYW5gUESyzsTGnMvVUmlV3XarBaJz9bGRmgPXh7jc
39+
VFrQhE0L/HV7LOfoLI9H2GWYyHBqN5ERBlcA8XxG3ZvX7t9nAZPQT2Xxe3GT3tro
40+
u5oCR+SyHN9xPnUwDuqUSvJ2eqMYb9B/Hph3OmtjG30jSNq9kOF5bBTk1hOTGPH4
41+
K/AY0jzT6OpHfXU6ytlFsI47ZKsnTUhipGsKucQ1CXlyirndZ3V3k70YaooZ55rG
42+
aIoAWlx2H0J7sAHmqS29N9jV9mo135d+d+TdLBXI0PXtiHzE9IPaX+ctdSUrPnp+
43+
TwR99lxglpIG6hLuvOMAaxiqFBB/Jf3XJ8OBakfS6nHrWH2WqQxRbiITl0irkQoz
44+
pwNEF2Bv0+Jvs1UFEdVGz5a8xexQHst/RmKrtHLct3iOCvBNqoAQRbvWvBhPjO/p
45+
V5cYeUljZ5wpHyFkaEViClaVWqa6PIsyLqmyjsruPCWlURLsQoQxABcL8bwxX7UT
46+
hM6CtH6tGlYZ85RIzRifIm2oudzV5l+8oRgFr9yVcwyOFT6JCioqkwldW52P1pk/
47+
/SnuexC6LYqqDuHUs5NnokzzpfS6QaWfTY5P5tz4KHJfsjDIktly3mKVfY0fSPVV
48+
okdGpcUzvz2hq1fqjxB6MlB/1vtk0bImfcsoxBmF7H+4E9ZN1sX/tSb0KQARAQAB
49+
tCZPcGVuIFJvYm90aWNzIDxpbmZvQG9zcmZvdW5kYXRpb24ub3JnPokCVAQTAQgA
50+
PgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBMHPbjHmut6IaLFytPQu1vur
51+
F8ZUBQJgsdhRBQkLTMW7AAoJEPQu1vurF8ZUTMwP/3f7EkOPIFjUdRmpNJ2db4iB
52+
RQu5b2SJRG+KIdbvQBzKUBMV6/RUhEDPjhXZI3zDevzBewvAMKkqs2Q1cWo9WV7Z
53+
PyTkvSyey/Tjn+PozcdvzkvrEjDMftIk8E1WzLGq7vnPLZ1q/b6Vq4H373Z+EDWa
54+
DaDwW72CbCBLWAVtqff80CwlI2x8fYHKr3VBUnwcXNHR4+nRABfAWnaU4k+oTshC
55+
Qucsd8vitNfsSXrKuKyz91IRHRPnJjx8UvGU4tRGfrHkw1505EZvgP02vXeRyWBR
56+
fKiL1vGy4tCSRDdZO3ms2J2m08VPv65HsHaWYMnO+rNJmMZj9d9JdL/9GRf5F6U0
57+
quoIFL39BhUEvBynuqlrqistnyOhw8W/IQy/ymNzBMcMz6rcMjMwhkgm/LNXoSD1
58+
1OrJu4ktQwRhwvGVarnB8ihwjsTxZFylaLmFSfaA+OAlOqCLS1OkIVMzjW+Ul6A6
59+
qjiCEUOsnlf4CGlhzNMZOx3low6ixzEqKOcfECpeIj80a2fBDmWkcAAjlHu6VBhA
60+
TUDG9e2xKLzV2Z/DLYsb3+n9QW7KO0yZKfiuUo6AYboAioQKn5jh3iRvjGh2Ujpo
61+
22G+oae3PcCc7G+z12j6xIY709FQuA49dA2YpzMda0/OX4LP56STEveDRrO+CnV6
62+
WE+F5FaIKwb72PL4rLi4
63+
=i0tj
64+
-----END PGP ARMORED FILE-----
8865
EOS
89-
90-
# Omit signed-by and use apt-key to import the key
91-
node.default['fb_apt']['repos'] << "deb #{node['boxcutter_ros']['mirror']} #{node['lsb']['codename']} main"
9266
when 'centos'
9367
fail 'Unsupported platform'
9468
end

‎cookbooks/boxcutter_ros/recipes/gazebo.rb‎

Lines changed: 39 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -18,76 +18,47 @@
1818

1919
case node['platform']
2020
when 'ubuntu'
21-
# For now, continue to publish keys installable by apt-key, so we don't have
22-
# to change fb_apt yet. apt-key is not going away until after Ubuntu 22.04.
23-
# Hopefully Facebook will accommodate fb_apt to work without apt-key so we
24-
# don't have to do it.
25-
#
26-
# To get the information needed from a gpg key, download it to a temporary
27-
# ubuntu install:
28-
#
21+
node.default['fb_apt']['sources']['gazebo'] = {
22+
'key' => 'gazebo',
23+
'url' => 'http://packages.osrfoundation.org/gazebo/ubuntu-stable',
24+
'suite' => node['lsb']['codename'],
25+
'components' => ['main'],
26+
}
2927
# curl -fsSLO https://packages.osrfoundation.org/gazebo.gpg
30-
#
31-
# List the key with `gpg --show-keys` like so:
32-
#
33-
# gpg --with-fingerprint --show-keys gazebo.gpg
34-
#
35-
# On 2025-01-02 show-keys looked like this:
36-
#
37-
# pub rsa2048 2015-04-01 [SC]
38-
# D248 6D2D D83D B692 72AF E988 6717 0598 AF24 9743
39-
# uid OSRF Repository (OSRF Repository GPG key) <osrfbuild@osrfoundation.org>
40-
# sub rsa2048 2015-04-01 [E]
41-
#
42-
# Use the last 16 digits of the key signature as the key for
43-
# node.default['fb_apt']['keys']:
44-
#
45-
# 6717 0598 AF24 9743
46-
#
47-
# To dump the key contents, run:
48-
#
49-
# gpg --enarmor < gazebo.gpg > gazebo.txt
50-
#
51-
# Then replace the GPG armored blocks with the following markers (content
52-
# remains the same:
53-
# -----BEGIN PGP PUBLIC KEY BLOCK-----
54-
# -----END PGP PUBLIC KEY BLOCK-----
55-
node.default['fb_apt']['keys']['67170598AF249743'] = <<-EOS
56-
-----BEGIN PGP PUBLIC KEY BLOCK-----
57-
58-
mQENBFUcKaEBCAD1ajXaWLnow3pZEv44Lypt6s5jAh1rYPN6zpaFZWdkzpwTdYU1
59-
Rpw/0hPzIoiyOPNwCti4E3+dSrv1ogEBu85P2XSy67RnabxF4/z7mPG/++u0EQav
60-
CwfrsN8OpJTtTxk+nKIhVwpAtob+KOLATerTPETrdrKh7qJ/FE8cw/XXbknjwywf
61-
R8uJqaKTu7mWNrTFaS3P5GZF5ss+ztf0EHcyYFMvzEVnSiOGBBL9pw91P1qpggBa
62-
lKL1Ilmf6zZBPihORJ/iTH5qMCAPDdR5BaxxEUHgz+pg+RkLKd2ENEaO+SCDVRhP
63-
yNdkYHpuIslyMHfXrh4y5nHclJ+bNXKXDcudABEBAAG0R09TUkYgUmVwb3NpdG9y
64-
eSAoT1NSRiBSZXBvc2l0b3J5IEdQRyBrZXkpIDxvc3JmYnVpbGRAb3NyZm91bmRh
65-
dGlvbi5vcmc+iQE4BBMBAgAiBQJVHCmhAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
66-
AQIXgAAKCRBnFwWYrySXQ/D4CACVnSdHT/1dEkOrYkCnaFLNBrG2tJdBrbIZOxKy
67-
+xV0yGniqsQFAxLESoy+ygaiKdTnAFlA24ozoNY8ur+oKMFt6CrUY01ItTq/WMA1
68-
iper0TO935SpDzNIPjPnD2WUSXShISWP0bFg64g0aAD1S7Yg/v7/eOmMSoeMav0T
69-
h8KOo6yhJuhgGp3lHKAKLppH94b77d8JYqGeP03Gv6gcaqNojyKccdXrKTugZui5
70-
+7V/cOJTo9XqzXjkpfwp24jR8FlKI7EWqCVqtRAXHeqRgo3OaKmuoKLcJ4/8BjSU
71-
+ppmJtEstSaL+qw49P/GQHwUkCHlx1mV5dSdVFLBPreli1ChuQENBFUcKaEBCAC7
72-
ZgTdYubw1sU/4A6+NvW/poBfh2DDOeh3uHJc0y235JFjr+tC1AwouaxLOUm8FE9k
73-
7qzwnyXbeklmXAHxw6wXZdE4PEYA/sgBYhTQy+s4PHlI6TGhwgcROkJKlW4Lld+W
74-
IJ/fzW93DXyhEkV3AAhkrVcOLOgCPdpK5EXxJ3p6dCOKC5Vjyz1PxTNcRaLpp9w6
75-
J0hLIXmmoCN4aoYSXWtL/C9J+B5Cr+HHgrmFsGNrHmmVv1gMXLcVzw5p3Z4d8SuT
76-
g9a1CemSE5bFIoOHKEQRwv/CGpoviAr+T3za3dPFTcSMOoJuYvoheTJ6fhf2sj74
77-
bp2Fwi4L7am/asfa7xWVABEBAAGJAR8EGAECAAkFAlUcKaECGwwACgkQZxcFmK8k
78-
l0OX9Af+IrzUChXf6H0nZZY77gcjwFgVChRX1RLzHTTHum4WNKGP9Sw1aGdHpmdt
79-
LhypQImxdT2yhCPEyB8EQxhgPHjqZ6UUMeYMw5rAvrcb3/ercy5pG7O8Z+Bea6hu
80-
TAXquJ1tsFessZwMS3RUXp/gtZCHbESR7PeBlZJWBWxG/lOmX7Z4fa88dWRU0Pl/
81-
nfns7v6eb57HXbf0teCitRRsJwCMhYbHj2m1slZHMjhEc6kv2bgPmAFb04bcyEAP
82-
BAo3BKu2XUVqE1t7Q2EfsItL/0FpfDY6zGKM6NIi+C40CsRl4W0o6egUhiDqsMYX
83-
9Su5aZdCoxMhzy5QxS3sXcpNAWH2gw==
84-
=YM5F
85-
-----END PGP PUBLIC KEY BLOCK-----
28+
# gpg --enarmor < gazebo.gpg > gazebo.asc
29+
node.default['fb_apt']['keymap']['gazebo'] = <<~EOS
30+
-----BEGIN PGP ARMORED FILE-----
31+
Comment: Use "gpg --dearmor" for unpacking
32+
33+
mQENBFUcKaEBCAD1ajXaWLnow3pZEv44Lypt6s5jAh1rYPN6zpaFZWdkzpwTdYU1
34+
Rpw/0hPzIoiyOPNwCti4E3+dSrv1ogEBu85P2XSy67RnabxF4/z7mPG/++u0EQav
35+
CwfrsN8OpJTtTxk+nKIhVwpAtob+KOLATerTPETrdrKh7qJ/FE8cw/XXbknjwywf
36+
R8uJqaKTu7mWNrTFaS3P5GZF5ss+ztf0EHcyYFMvzEVnSiOGBBL9pw91P1qpggBa
37+
lKL1Ilmf6zZBPihORJ/iTH5qMCAPDdR5BaxxEUHgz+pg+RkLKd2ENEaO+SCDVRhP
38+
yNdkYHpuIslyMHfXrh4y5nHclJ+bNXKXDcudABEBAAG0R09TUkYgUmVwb3NpdG9y
39+
eSAoT1NSRiBSZXBvc2l0b3J5IEdQRyBrZXkpIDxvc3JmYnVpbGRAb3NyZm91bmRh
40+
dGlvbi5vcmc+iQE4BBMBAgAiBQJVHCmhAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
41+
AQIXgAAKCRBnFwWYrySXQ/D4CACVnSdHT/1dEkOrYkCnaFLNBrG2tJdBrbIZOxKy
42+
+xV0yGniqsQFAxLESoy+ygaiKdTnAFlA24ozoNY8ur+oKMFt6CrUY01ItTq/WMA1
43+
iper0TO935SpDzNIPjPnD2WUSXShISWP0bFg64g0aAD1S7Yg/v7/eOmMSoeMav0T
44+
h8KOo6yhJuhgGp3lHKAKLppH94b77d8JYqGeP03Gv6gcaqNojyKccdXrKTugZui5
45+
+7V/cOJTo9XqzXjkpfwp24jR8FlKI7EWqCVqtRAXHeqRgo3OaKmuoKLcJ4/8BjSU
46+
+ppmJtEstSaL+qw49P/GQHwUkCHlx1mV5dSdVFLBPreli1ChuQENBFUcKaEBCAC7
47+
ZgTdYubw1sU/4A6+NvW/poBfh2DDOeh3uHJc0y235JFjr+tC1AwouaxLOUm8FE9k
48+
7qzwnyXbeklmXAHxw6wXZdE4PEYA/sgBYhTQy+s4PHlI6TGhwgcROkJKlW4Lld+W
49+
IJ/fzW93DXyhEkV3AAhkrVcOLOgCPdpK5EXxJ3p6dCOKC5Vjyz1PxTNcRaLpp9w6
50+
J0hLIXmmoCN4aoYSXWtL/C9J+B5Cr+HHgrmFsGNrHmmVv1gMXLcVzw5p3Z4d8SuT
51+
g9a1CemSE5bFIoOHKEQRwv/CGpoviAr+T3za3dPFTcSMOoJuYvoheTJ6fhf2sj74
52+
bp2Fwi4L7am/asfa7xWVABEBAAGJAR8EGAECAAkFAlUcKaECGwwACgkQZxcFmK8k
53+
l0OX9Af+IrzUChXf6H0nZZY77gcjwFgVChRX1RLzHTTHum4WNKGP9Sw1aGdHpmdt
54+
LhypQImxdT2yhCPEyB8EQxhgPHjqZ6UUMeYMw5rAvrcb3/ercy5pG7O8Z+Bea6hu
55+
TAXquJ1tsFessZwMS3RUXp/gtZCHbESR7PeBlZJWBWxG/lOmX7Z4fa88dWRU0Pl/
56+
nfns7v6eb57HXbf0teCitRRsJwCMhYbHj2m1slZHMjhEc6kv2bgPmAFb04bcyEAP
57+
BAo3BKu2XUVqE1t7Q2EfsItL/0FpfDY6zGKM6NIi+C40CsRl4W0o6egUhiDqsMYX
58+
9Su5aZdCoxMhzy5QxS3sXcpNAWH2gw==
59+
=YM5F
60+
-----END PGP ARMORED FILE-----
8661
EOS
87-
88-
# Omit signed-by and use apt-key to import the key
89-
node.default['fb_apt']['repos'] << \
90-
"deb http://packages.osrfoundation.org/gazebo/ubuntu-stable #{node['lsb']['codename']} main"
9162
when 'centos'
9263
fail 'Unsupported platform'
9364
end

‎cookbooks/boxcutter_ros/test/cookbooks/boxcutter_ros_test/recipes/default.rb‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# Recipe:: default
44
#
55

6-
node.default['boxcutter_ros']['mirror'] = \
7-
'https://aws-boxcutter-nexus.org.boxcutter.net/repository/ros-apt-proxy/'
8-
96
include_recipe 'boxcutter_ros::common'
107
include_recipe 'boxcutter_ros::user'
118
include_recipe 'boxcutter_ros::default'

0 commit comments

Comments
 (0)