POW-674: hardening flags testing

teamookla · Jul 18, 2023 · bf37823 · bf37823
1 parent 0b2a667
commit bf37823
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ message("  +--> C Compiler: ${CMAKE_C_COMPILER}")
 message("  +--> CXX Compiler: ${CMAKE_CXX_COMPILER}")
 message("  +--> Environment CFLAGS: $ENV{CFLAGS}")
 
-enable_hardening_flags()
+# enable_hardening_flags()
 ## END OOKLA CHANGES ##
 
 # Put the libaries and binaries that get built into directories at the

diff --git a/Jenkinsfile-Native b/Jenkinsfile-Native
@@ -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) {
@@ -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")
               }
             }

diff --git a/jenkins.sh b/jenkins.sh
@@ -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=