Skip to content

POW-674: hardening flags testing #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knuckolls wants to merge 1 commit into
base: poco-1.12.4
Choose a base branch
from
Open

POW-674: hardening flags testing #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Jenkinsfile-Native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ def agents = [
]

def builds = [
'linux64-deb9': [ agent: agents.deb9_64bit, openssl: 'deb9_64bit', toolchain: "none" ],
'linux-x86_64-static-musl': [ agent: agents.deb9_64bit, openssl: "static-x86_64-musl", toolchain: 'static-musl-x86_64-linux-musl',
CFLAGS: '-DOOKLA_DISABLE_THREAD_NAME=1' ],
'linux-x86-static-musl': [ agent: agents.deb9_64bit, openssl: "static-i386-musl", toolchain: 'static-musl-i386-linux-musl',
CFLAGS: '-DOOKLA_DISABLE_THREAD_NAME=1' ],
'linux-aarch64-static-musl': [ agent: agents.deb9_64bit, openssl: "static-aarch64-musl", toolchain: 'static-musl-aarch64-linux-musl',
CFLAGS: '-DOOKLA_DISABLE_THREAD_NAME=1' ],
'freebsd12_64': [ agent: agents.freebsd12_64, openssl: 'freebsd12_64bit', toolchain: "none" ],
'freebsd13_64': [ agent: agents.freebsd13_64, openssl: 'freebsd13_64bit', toolchain: "none"],
// 'linux64-deb9': [ agent: agents.deb9_64bit, openssl: 'deb9_64bit', toolchain: "none" ],
// 'linux-x86_64-static-musl': [ agent: agents.deb9_64bit, openssl: "static-x86_64-musl", toolchain: 'static-musl-x86_64-linux-musl',
// CFLAGS: '-DOOKLA_DISABLE_THREAD_NAME=1' ],
// 'linux-x86-static-musl': [ agent: agents.deb9_64bit, openssl: "static-i386-musl", toolchain: 'static-musl-i386-linux-musl',
// CFLAGS: '-DOOKLA_DISABLE_THREAD_NAME=1' ],
// 'linux-aarch64-static-musl': [ agent: agents.deb9_64bit, openssl: "static-aarch64-musl", toolchain: 'static-musl-aarch64-linux-musl',
// CFLAGS: '-DOOKLA_DISABLE_THREAD_NAME=1' ],
// 'freebsd12_64': [ agent: agents.freebsd12_64, openssl: 'freebsd12_64bit', toolchain: "none" ],
// 'freebsd13_64': [ agent: agents.freebsd13_64, openssl: 'freebsd13_64bit', toolchain: "none"],
'macosx': [ agent: agents.macos, openssl: 'macos', toolchain: "none" ],
'windows32': [ agent: agents.win32, winPlatform:'x86', openssl: 'win32', toolchain: "none" ],
'windows64': [ agent: agents.win64, winPlatform:'x64', openssl: 'win64', toolchain: "none" ],
// 'windows32': [ agent: agents.win32, winPlatform:'x86', openssl: 'win32', toolchain: "none" ],
// 'windows64': [ agent: agents.win64, winPlatform:'x64', openssl: 'win64', toolchain: "none" ],
]

def createBuildStages(builds) {
Expand Down Expand Up @@ -104,7 +104,7 @@ def createBuildStage(name, definition) {
zip zipFile:"cmake_install_${buildType}.zip", dir:"cmake_install_${buildType}"
s3Upload(
bucket:'ookla-native-artifacts',
path:"${APPLICATION_NAME}/${env.BRANCH_NAME}/${APPLICATION_NAME}-${version}-${PLATFORM}-${buildType}.zip",
path:"${APPLICATION_NAME}/${env.BRANCH_NAME}/${APPLICATION_NAME}-${version}-${PLATFORM}-${buildType}-PR-18-knuckolls-test.zip",
file:"cmake_install_${buildType}.zip")
}
}
Expand Down
5 changes: 3 additions & 2 deletions jenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ env
JENKINS_PLATFORM=${PLATFORM}

rm -rf shared
git clone --depth 1 git@github.com:teamookla/speedtest-sharedsuite.git shared

#git clone --depth 1 git@github.com:teamookla/speedtest-sharedsuite.git shared
git clone git@github.com:teamookla/speedtest-sharedsuite.git shared
(cd shared && git checkout feature/POW-674/verify-hardening-flags-testing)
. ./shared/build/ccache.sh

CONFIGURE_FLAGS=
Expand Down