Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Fix azure pipelines #21

Merged
merged 9 commits into from
Nov 27, 2020
Merged

Fix azure pipelines #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b17ad77
Test: does azure devops pickup this commit?
Nov 15, 2020
86bffed
Another test
Nov 15, 2020
933a1f1
Update service connection for github release
Nov 15, 2020
eb4e8a4
CTest scripts should propagate failing tests as errors
Nov 15, 2020
b3677db
Trigger azure devops on pushed tags
Nov 16, 2020
84bc87e
Correct OR condition to be in capital letters
Nov 16, 2020
0cc5406
Increase build pipeline timeout
Nov 23, 2020
1960cdc
Add linker flags for thread sanitizer build
Nov 25, 2020
56c88d0
Temporarily disable thread sanitizer until we can successfully build it
Nov 25, 2020
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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ nightly:
ctest -S ctest_scripts/CTestCoverage.cmake -DCTEST_SOURCE_DIRECTORY=. -DCTEST_BINARY_DIRECTORY=../ioc-hierarchy-service-docker-build
ctest -S ctest_scripts/CTestASAN.cmake -DCTEST_SOURCE_DIRECTORY=. -DCTEST_BINARY_DIRECTORY=../ioc-hierarchy-service-docker-build
ctest -S ctest_scripts/CTestMSAN.cmake -DCTEST_SOURCE_DIRECTORY=. -DCTEST_BINARY_DIRECTORY=../ioc-hierarchy-service-docker-build
ctest -S ctest_scripts/CTestTSAN.cmake -DCTEST_SOURCE_DIRECTORY=. -DCTEST_BINARY_DIRECTORY=../ioc-hierarchy-service-docker-build
# Disabling thread sanitizer build for now as the build is mysteriously failing in the abseil code
# ctest -S ctest_scripts/CTestTSAN.cmake -DCTEST_SOURCE_DIRECTORY=. -DCTEST_BINARY_DIRECTORY=../ioc-hierarchy-service-docker-build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment away or remove?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a comment more about why we are temporarily not building this target


continuous:
rm -rf *.o ../ioc-hierarchy-service-docker-build
Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
# https://docs.microsoft.com/azure/devops/pipelines/languages/docker

trigger:
branches:
tags:
include:
- master
- id-*

pr:
- master
- v*
branches:
exclude:
- wip*

resources:
- repo: self
Expand All @@ -22,6 +21,7 @@ stages:
displayName: Build image
jobs:
- job: Build
timeoutInMinutes: 120
displayName: Build
pool:
vmImage: 'ubuntu-latest'
Expand All @@ -36,6 +36,6 @@ stages:
- task: GithubRelease@0
displayName: 'Create GitHub Release'
inputs:
gitHubConnection: ioc-hierarchy-service
gitHubConnection: 'GitHub connection 1'
repositoryName: equinor/ioc-hierarchy-service
assets: ./*.deb
14 changes: 12 additions & 2 deletions ctest_scripts/CTestASAN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,21 @@ CMAKE_CXX_FLAGS=-g -O1 -fsanitize=address -fno-omit-frame-pointer

ctest_configure()
ctest_build(FLAGS -j8)
ctest_test(EXCLUDE ^opencensus)
ctest_memcheck(EXCLUDE ^opencensus)
ctest_test(
EXCLUDE ^opencensus
RETURN_VALUE test_result
)
ctest_memcheck(
EXCLUDE ^opencensus
RETURN_VALUE memcheck_result
)

set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "s039-ioc-cdash.azurewebsites.net")
set(CTEST_DROP_LOCATION "/submit.php?project=ioc-hierarchy-service")
set(CTEST_DROP_SITE_CDASH TRUE)
ctest_submit()

if (test_result OR memcheck_result)
message(FATAL_ERROR "Tests failed")
endif ()
9 changes: 8 additions & 1 deletion ctest_scripts/CTestContinuous.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ CMAKE_BUILD_TYPE=Release

ctest_configure()
ctest_build(FLAGS -j8)
ctest_test(EXCLUDE ^opencensus)
ctest_test(
EXCLUDE ^opencensus
RETURN_VALUE test_result
)

set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "s039-ioc-cdash.azurewebsites.net")
set(CTEST_DROP_LOCATION "/submit.php?project=ioc-hierarchy-service")
set(CTEST_DROP_SITE_CDASH TRUE)
ctest_submit()

if (test_result)
message(FATAL_ERROR "Tests failed")
endif ()
9 changes: 8 additions & 1 deletion ctest_scripts/CTestCoverage.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,18 @@ CMAKE_LDFLAGS=-fprofile-arcs -ftest-coverage

ctest_configure()
ctest_build(FLAGS -j8)
ctest_test(EXCLUDE ^opencensus)
ctest_test(
EXCLUDE ^opencensus
RETURN_VALUE test_result
)
ctest_coverage(LABELS tag_hierarchy)

set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "s039-ioc-cdash.azurewebsites.net")
set(CTEST_DROP_LOCATION "/submit.php?project=ioc-hierarchy-service")
set(CTEST_DROP_SITE_CDASH TRUE)
ctest_submit()

if (test_result)
message(FATAL_ERROR "Tests failed")
endif ()
14 changes: 12 additions & 2 deletions ctest_scripts/CTestMSAN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,21 @@ CMAKE_CXX_FLAGS=-g -O1 -fsanitize=undefined -fno-omit-frame-pointer

ctest_configure()
ctest_build(FLAGS -j8)
ctest_test(EXCLUDE ^opencensus)
ctest_memcheck(EXCLUDE ^opencensus)
ctest_test(
EXCLUDE ^opencensus
RETURN_VALUE test_result
)
ctest_memcheck(
EXCLUDE ^opencensus
RETURN_VALUE memcheck_result
)

set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "s039-ioc-cdash.azurewebsites.net")
set(CTEST_DROP_LOCATION "/submit.php?project=ioc-hierarchy-service")
set(CTEST_DROP_SITE_CDASH TRUE)
ctest_submit()

if (test_result OR memcheck_result)
message(FATAL_ERROR "Tests failed")
endif ()
17 changes: 15 additions & 2 deletions ctest_scripts/CTestTSAN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,29 @@ ctest_start(Experimental)

file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
CMAKE_CXX_FLAGS=-g -O1 -fsanitize=thread -fno-omit-frame-pointer -fPIC
CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=thread")
CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -fsanitize=thread")
CMAKE_GENERATOR=Unix Makefiles
")

ctest_configure()
ctest_build(FLAGS -j8)
ctest_test(EXCLUDE ^opencensus)
ctest_memcheck(EXCLUDE ^opencensus)
ctest_test(
EXCLUDE ^opencensus
RETURN_VALUE test_result
)
ctest_memcheck(
EXCLUDE ^opencensus
RETURN_VALUE memcheck_result
)

set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "s039-ioc-cdash.azurewebsites.net")
set(CTEST_DROP_LOCATION "/submit.php?project=ioc-hierarchy-service")
set(CTEST_DROP_SITE_CDASH TRUE)
ctest_submit()

if (test_result OR memcheck_result)
message(FATAL_ERROR "Tests failed")
endif ()