Skip to content

Commit de278da

Browse files
authored
Merge branch 'rr-debugger:master' into pcp-pr
2 parents a86f1e5 + 1d59f70 commit de278da

File tree

6 files changed

+20
-36
lines changed

6 files changed

+20
-36
lines changed

release-process/distro-configs/centos8.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

release-process/distro-configs/debian10.json

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Ubuntu 24.10",
3+
"ami_owner": "099720109477",
4+
"ami_name_pattern": "ubuntu/images/hvm-ssd-gp3/ubuntu-oracular-24.10-*",
5+
"user": "ubuntu",
6+
"archs": ["x86_64", "arm64"],
7+
"setup_commands": [
8+
"cloud-init status --wait",
9+
"sudo apt-get update -y",
10+
"sudo apt-get dist-upgrade -f -y"
11+
],
12+
"install_build_deps": "sudo apt-get install -y rpm ccache cmake g++ pkg-config zlib1g-dev git python-dev-is-python3 libacl1-dev ninja-build manpages-dev capnproto libcapnp-dev gdb lldb python3-pexpect libzstd1 libzstd-dev",
13+
"install_build_deps_x86_64": "sudo apt-get install -y g++-multilib",
14+
"install_app_test_deps": "sudo apt-get install -y tightvncserver xtightvncviewer curl tar bzip2 libdbus-glib-1-2 libreoffice"
15+
}

release-process/prepare-release.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
dist_packaging = {
1515
('ubuntu20-lts', 'x86_64'): 'TGZ;DEB',
1616
('ubuntu22-lts', 'arm64'): 'TGZ;DEB',
17-
('centos8', 'x86_64'): 'RPM',
17+
('centos9', 'x86_64'): 'RPM',
1818
('centos9', 'arm64'): 'RPM',
1919
}
2020

release-process/rr-testing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function xvnc-runner { CMD=$1 EXPECT=$2
8989
if [[ $test_firefox == 1 ]]; then
9090
rm -rf /tmp/firefox /tmp/firefox-profile || true
9191
mkdir /tmp/firefox-profile
92-
( cd /tmp; curl -L 'https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US' | tar -jxf - )
92+
( cd /tmp; curl -L 'https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US' | tar -Jxf - )
9393
xvnc-runner "/tmp/firefox/firefox --profile /tmp/firefox-profile $HOME/rr/release-process/test-data/test.html" "rr Test Page"
9494
fi
9595

release-process/test-system.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self, machine_type, architecture, distro_config, keypair_pem_file):
4646
if len(images) == 0:
4747
raise Exception('No AMIs match filter')
4848
latest_image = sorted(map(lambda image: (
49-
datetime.strptime(image['CreationDate'], '%Y-%m-%dT%H:%M:%S.%f%z'),
49+
datetime.strptime(image['CreationDate'], '%Y-%m-%dT%H:%M:%S.%f%z').timestamp(),
5050
image
5151
), response['Images']))[-1][1]
5252
ami = latest_image['ImageId']
@@ -115,6 +115,8 @@ def ssh_command(self):
115115
def ssh_options(self):
116116
return ['-i', self.keypair_pem_file,
117117
'-o', 'StrictHostKeyChecking=no',
118+
# A broken agent config can stop SSH from working. Bypass that.
119+
'-o', 'IdentityAgent=none',
118120
'-o', 'BatchMode=yes',
119121
'-o', 'ConnectTimeout=5',
120122
'-o', 'IdentitiesOnly=yes']

0 commit comments

Comments
 (0)