Skip to content

Commit 93771cc

Browse files
committed
Add support for osx arm64. Fix ppc64le download link.
1 parent 6d0bf81 commit 93771cc

File tree

8 files changed

+113
-9
lines changed

8 files changed

+113
-9
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.compile.nullAnalysis.mode": "automatic"
3+
}

Jenkinsfile

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
pipeline {
2+
3+
agent {
4+
kubernetes {
5+
yamlFile 'jenkins/agent.yaml'
6+
defaultContainer 'maven'
7+
}
8+
}
9+
10+
options {
11+
disableConcurrentBuilds()
12+
buildDiscarder(logRotator(numToKeepStr: '100'))
13+
timeout(time: 30, unit: 'MINUTES')
14+
}
15+
16+
stages {
17+
stage("Setup") {
18+
steps {
19+
sh '''
20+
apt update
21+
apt install -y binutils cpio libaio1 libaio-dev libnuma-dev rpm2cpio tree xz-utils
22+
printenv | sort
23+
'''
24+
}
25+
}
26+
27+
stage ("Maven") {
28+
steps {
29+
sh '''
30+
mvn verify
31+
'''
32+
}
33+
}
34+
}
35+
36+
post {
37+
always {
38+
archiveArtifacts artifacts: "surefire-reports/",
39+
allowEmptyArchive: true
40+
}
41+
fixed {
42+
slackSend(color: "good", message: "fixed ${RUN_DISPLAY_URL}")
43+
}
44+
failure {
45+
slackSend(color: "danger", message: "failure ${RUN_DISPLAY_URL}")
46+
}
47+
}
48+
}

jenkins/agent.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: v1
2+
kind: Pod
3+
metadata:
4+
namespace: oss-agent
5+
labels:
6+
containers: maven
7+
spec:
8+
nodeSelector:
9+
eks.amazonaws.com/nodegroup: eks-oss-presto-dynamic-managed-ng
10+
serviceAccountName: oss-agent
11+
containers:
12+
- name: maven
13+
image: maven:3.8.6-openjdk-8-slim
14+
tty: true
15+
resources:
16+
requests:
17+
memory: "3Gi"
18+
cpu: "500m"
19+
limits:
20+
memory: "3Gi"
21+
cpu: "500m"
22+
env:
23+
- name: MAVEN_OPTS
24+
value: "-Xmx3g -Xms3g"
25+
command:
26+
- cat

testing-mysql-server-5/repack-mysql-5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44

55
VERSION=5.7.22
66
BASEURL="https://dev.mysql.com/get/Downloads/MySQL-5.7"
7-
PPC64LE_BASEURL="http://yum.mariadb.org/10.2/centos/7/ppc64le/rpms/"
7+
PPC64LE_BASEURL="http://archive.mariadb.org/mariadb-10.2.36/yum/centos/7/ppc64le/rpms"
88

99
LINUX_BASE=mysql-$VERSION-linux-glibc2.12-x86_64
1010
LINUX_PPC64LE_RPM=MariaDB-server-10.2.36-1.el7.centos.ppc64le.rpm

testing-mysql-server-5/src/main/java/com/facebook/presto/testing/mysql/EmbeddedMySql5.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public List<String> getStartArguments()
7373
else {
7474
return iList
7575
.add(
76+
"--user=root",
7677
"--skip-ssl",
7778
"--disable-partition-engine-check",
7879
"--explicit_defaults_for_timestamp",

testing-mysql-server-8/repack-mysql-8.sh

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
set -eu
44

5-
VERSION=8.0.15
5+
VERSION=8.0.26
66
BASEURL="https://dev.mysql.com/get/Downloads/MySQL-8.0"
77

88
LINUX_BASE=mysql-$VERSION-linux-glibc2.12-x86_64
9-
OSX_BASE=mysql-$VERSION-macos10.14-x86_64
9+
OSX_BASE=mysql-$VERSION-macos11-x86_64
10+
OSX_AARCH64_BASE=mysql-$VERSION-macos11-arm64
1011

1112
TAR=tar
1213
command -v gtar >/dev/null && TAR=gtar
@@ -43,12 +44,17 @@ LINUX_DIST=dist/$LINUX_NAME
4344
OSX_NAME=$OSX_BASE.tar.gz
4445
OSX_DIST=dist/$OSX_NAME
4546

47+
OSX_AARCH64_NAME=$OSX_AARCH64_BASE.tar.gz
48+
OSX_AARCH64_DIST=dist/$OSX_AARCH64_NAME
49+
4650
test -e $LINUX_DIST || curl -L -o $LINUX_DIST "$BASEURL/$LINUX_NAME" --fail
4751
test -e $OSX_DIST || curl -L -o $OSX_DIST "$BASEURL/$OSX_NAME" --fail
52+
test -e $OSX_AARCH64_DIST || curl -L -o $OSX_AARCH64_DIST "$BASEURL/$OSX_AARCH64_DIST" --fail
4853

4954
PACKDIR=$(mktemp -d "${TMPDIR:-/tmp}/mysql.XXXXXXXXXX")
5055
$TAR -xf $LINUX_DIST -C $PACKDIR
5156
pushd $PACKDIR/$LINUX_BASE
57+
tree .
5258
$STRIP bin/mysqld
5359
$TAR -czf $OLDPWD/$RESOURCES/mysql-Linux-amd64.tar.gz \
5460
LICENSE \
@@ -58,17 +64,17 @@ $TAR -czf $OLDPWD/$RESOURCES/mysql-Linux-amd64.tar.gz \
5864
share/*.txt \
5965
share/charsets \
6066
share/english \
61-
lib/libcrypto.* \
62-
lib/libssl.* \
63-
bin/libcrypto.* \
64-
bin/libssl.* \
67+
lib/private/libcrypto.* \
68+
lib/private/libprotobuf-lite.* \
69+
lib/private/libssl.* \
6570
bin/mysqld
6671
popd
6772
rm -rf $PACKDIR
6873

6974
PACKDIR=$(mktemp -d "${TMPDIR:-/tmp}/mysql.XXXXXXXXXX")
7075
$TAR -xf $OSX_DIST -C $PACKDIR
7176
pushd $PACKDIR/$OSX_BASE
77+
tree .
7278
$TAR -czf $OLDPWD/$RESOURCES/mysql-Mac_OS_X-x86_64.tar.gz \
7379
LICENSE \
7480
README \
@@ -78,6 +84,26 @@ $TAR -czf $OLDPWD/$RESOURCES/mysql-Mac_OS_X-x86_64.tar.gz \
7884
share/charsets \
7985
share/english \
8086
lib/libcrypto.* \
87+
lib/libprotobuf-lite.* \
88+
lib/libssl.* \
89+
bin/mysqld
90+
popd
91+
rm -rf $PACKDIR
92+
93+
PACKDIR=$(mktemp -d "${TMPDIR:-/tmp}/mysql.XXXXXXXXXX")
94+
$TAR -xf $OSX_AARCH64_DIST -C $PACKDIR
95+
pushd $PACKDIR/$OSX_AARCH64_BASE
96+
tree .
97+
$TAR -czf $OLDPWD/$RESOURCES/mysql-Mac_OS_X-aarch64.tar.gz \
98+
LICENSE \
99+
README \
100+
docs/INFO* \
101+
share/*.sql \
102+
share/*.txt \
103+
share/charsets \
104+
share/english \
105+
lib/libcrypto.* \
106+
lib/libprotobuf-lite.* \
81107
lib/libssl.* \
82108
bin/mysqld
83109
popd

testing-mysql-server-8/src/main/java/com/facebook/presto/testing/mysql/EmbeddedMySql8.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public List<String> getInitializationArguments()
4141
public List<String> getStartArguments()
4242
{
4343
return ImmutableList.of(
44-
"--no-defaults",
44+
"--user=root",
4545
"--skip-ssl",
4646
"--skip-mysqlx",
4747
"--default-time-zone=+00:00",

testing-mysql-server-8/src/test/java/com/facebook/presto/testing/mysql/TestTestingMySqlServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class TestTestingMySqlServer
2121
@Override
2222
public String getMySqlVersion()
2323
{
24-
return "8.0.15";
24+
return "8.0.26";
2525
}
2626

2727
@Override

0 commit comments

Comments
 (0)