Skip to content

Commit 5f07168

Browse files
author
Przemek Bruski
committed
JPERF-449 fixed compatibility of tests with Ubuntu bionic+
1 parent 8444f90 commit 5f07168

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/test/kotlin/com/atlassian/performance/tools/virtualusers/lib/infrastructure/Jperf425WorkaroundMysqlDatabase.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Jperf425WorkaroundMysqlDatabase(
2525
}
2626

2727
/**
28-
* Copy-pasted verbatim from [infrastructure:4.11.0](https://github.com/atlassian/infrastructure/blob/release-4.11.0/src/main/kotlin/com/atlassian/performance/tools/infrastructure/Docker.kt)
28+
* Copy-pasted verbatim from [infrastructure](https://github.com/atlassian/infrastructure/blob/master/src/main/kotlin/com/atlassian/performance/tools/infrastructure/Docker.kt)
2929
* It's here just to interject the Docker install and MySQL setup with a Docker start.
3030
*/
3131
private class CopyPastedDocker {
@@ -48,15 +48,15 @@ private class CopyPastedDocker {
4848
),
4949
timeout = Duration.ofMinutes(2)
5050
)
51+
ssh.execute("sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7EA0A9C3F273FCD8")
52+
5153
val release = ssh.execute("lsb_release -cs").output
52-
val repository = "deb [arch=amd64] https://download.docker.com/linux/ubuntu $release stable"
53-
ssh.execute("sudo add-apt-repository \"$repository\"")
54-
ssh.execute("curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -")
55-
val version = "17.09.0~ce-0~ubuntu"
54+
ssh.execute("sudo add-apt-repository 'deb [arch=amd64] https://download.docker.com/linux/ubuntu $release stable'")
55+
val version = "5:19.03.8~3-0~ubuntu-$release"
5656
ubuntu.install(
5757
ssh = ssh,
5858
packages = listOf("docker-ce=$version"),
59-
timeout = Duration.ofSeconds(180)
59+
timeout = Duration.ofMinutes(5)
6060
)
6161
}
6262
}

0 commit comments

Comments
 (0)