Skip to content

Commit 86c530d

Browse files
mer-a-obenjaminmenetrier
mer-a-o
and
benjaminmenetrier
authored
update cdash server (#195)
Co-authored-by: benjaminmenetrier <[email protected]>
1 parent e5b785a commit 86c530d

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

‎CI/buildspec_clang.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ phases:
2323
- echo $CODEBUILD_WEBHOOK_TRIGGER
2424
- echo $CODEBUILD_WEBHOOK_BASE_REF
2525

26+
# read cdash url from s3
27+
- wget https://ci-test-cdash-url.s3.amazonaws.com/cdash_url.txt
28+
- CDASH_URL=$(cat cdash_url.txt)
29+
2630
# Codebuild only runs on PUSH events if HEAD_REF
2731
# is refs/heads/develop (merge to develop). In this
2832
# case CODEBUILD_GIT_BRANCH="develop"
@@ -74,6 +78,7 @@ phases:
7478
- cp CMakeLists.txt /jcsda/saber-bundle
7579
- cp -r cmake /jcsda/saber-bundle/
7680
- cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle
81+
- sed -i "s@CDASH_URL@$CDASH_URL@g" /jcsda/saber-bundle/CTestConfig.cmake
7782

7883
# print list
7984
- cd /jcsda/saber-bundle
@@ -120,8 +125,7 @@ phases:
120125
# upload find cdash url and upload it as CodeBuild artifact to S3
121126
- if [ "$BUILD_STATUS" = "1" ];
122127
then echo "Build & tests passed, find cdash url";
123-
bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /build_container/saber/Testing;
124-
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /build_container/saber/Testing);
128+
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /build_container/saber/Testing $CDASH_URL);
125129
echo $url;
126130
echo ${url} > /jcsda/artifacts/cdash-url.txt;
127131
cat /jcsda/artifacts/cdash-url.txt;

‎CI/buildspec_gnu.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ phases:
3535
- echo "CODEBUILD_GIT_BRANCH=${CODEBUILD_GIT_BRANCH}"
3636
- echo "CODEBUILD_SOURCE_VERSION=${CODEBUILD_SOURCE_VERSION}"
3737

38+
# read cdash url from s3
39+
- wget https://ci-test-cdash-url.s3.amazonaws.com/cdash_url.txt
40+
- CDASH_URL=$(cat cdash_url.txt)
41+
3842
pre_build:
3943
commands:
4044
- echo Executing pre_build phase
@@ -67,6 +71,7 @@ phases:
6771

6872
# cdash upload setup
6973
- cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle/
74+
- sed -i "s@CDASH_URL@$CDASH_URL@g" /jcsda/saber-bundle/CTestConfig.cmake
7075
- chmod -R 777 /jcsda/saber-bundle
7176

7277
build:
@@ -122,8 +127,7 @@ phases:
122127
# upload find cdash url and upload it as CodeBuild artifact to S3
123128
- if [ "$BUILD_STATUS" = "1" ];
124129
then echo "Build & tests passed, find cdash url";
125-
bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing;
126-
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing);
130+
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing $CDASH_URL);
127131
echo $url;
128132
echo ${url} > /jcsda/artifacts/cdash-url.txt;
129133
cat /jcsda/artifacts/cdash-url.txt;

‎CI/buildspec_intel.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ phases:
5555
- cd CI
5656
- . /etc/profile.d/intel.sh
5757

58+
# read cdash url from s3
59+
- wget https://ci-test-cdash-url.s3.amazonaws.com/cdash_url.txt
60+
- CDASH_URL=$(cat cdash_url.txt)
61+
5862
# jedi-cmake
5963
- ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/jedi-cmake $CODEBUILD_GIT_BRANCH jedicmake /jcsda/saber-bundle develop
6064

@@ -73,6 +77,7 @@ phases:
7377

7478
# cdash upload setup
7579
- cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle/
80+
- sed -i "s@CDASH_URL@$CDASH_URL@g" /jcsda/saber-bundle/CTestConfig.cmake
7681
- chmod 777 -R /jcsda/saber-bundle
7782

7883
# print list
@@ -140,8 +145,7 @@ phases:
140145
# upload find cdash url and upload it as CodeBuild artifact to S3
141146
- if [ "$BUILD_STATUS" = "1" ];
142147
then echo "Build & tests passed, find cdash url";
143-
bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing;
144-
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing);
148+
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing $CDASH_URL);
145149
echo $url;
146150
echo ${url} > /jcsda/artifacts/cdash-url.txt;
147151
cat /jcsda/artifacts/cdash-url.txt;

‎CI/cdash-url.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

33
dir=$1
4+
cdash_url=$2
45
tag=$(head -1 $dir/TAG)
56
Done=$(cat $dir/$tag/Done.xml)
67
buildID=$(echo $Done | grep -o -P '(?<=buildId>).*(?=</build)')
7-
URL=https://cdash.jcsda.org/buildSummary.php?buildid=$buildID
8+
URL=$cdash_url/viewTest.php?buildid=$buildID
89
echo $URL

‎CI/cmake/CTestConfig.cmake‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
set(CTEST_PROJECT_NAME "JEDI")
1+
set(CTEST_PROJECT_NAME "saber")
22
set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
3-
set(CTEST_DROP_METHOD "https")
4-
set(CTEST_DROP_SITE "cdash.jcsda.org")
5-
set(CTEST_DROP_SITE_CDASH TRUE)
3+
set(CTEST_SUBMIT_URL "CDASH_URL/submit.php?project=${CTEST_PROJECT_NAME}")
64
set(CTEST_USE_LAUNCHERS 1)
75
set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 1)
86
set(CTEST_LABELS_FOR_SUBPROJECTS saber)
9-
set(CTEST_DROP_LOCATION "/submit.php?project=saber")

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
### Continuous integration:
2-
| Platform | JCSDA-internal | JCSDA |
3-
| ------------- | ------------- |------------- |
4-
| GNU | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieXA5WFFUZk5NMDVvV0ZkZVBQUDRVeFN3VDk5aVkvZHJ0K3ZWaEl6RlVZNGdCTEI0Y283QU5TTzVTS0k0N0hNYjl4allwY21SRlFWVjJYTEFjSlJUUlZVPSIsIml2UGFyYW1ldGVyU3BlYyI6ImxZNTZLc3VXcGNVYktCeVQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-gnu/history) | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiV2dVMmxFVENKL2dCVzN5UlgyZHJuSmhvbTV6dDhOalYwTEJDaXdZWGFDbXp2YlU4VzdsV3ZRNm9mT25mRnM3NlVYWXE2R2pmYVlZbWhxbHJ1OXFpdzVjPSIsIml2UGFyYW1ldGVyU3BlYyI6Ilp2T04vNnBRR0xFYmQ3UzAiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-gnu/history)
5-
| Intel | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoidC9ZWmlyNU8xZmdjd0kxbFJzcGVNTlhJSDdBcFJ4RUdwNjNmcnFzQ1VWUUNaMWFEZkwvbHlkZUxTaTZIZlQyWWxOMGtvVzRaTlpRNGdjbFVUK0ZaRDFvPSIsIml2UGFyYW1ldGVyU3BlYyI6IllwQlZTb2JNdnJjOEo5TlgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-intel/history) | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiYUROTE5DZVdranpBQTBKbTlBam1vb2pVWXJteDdEMk1RLzhWdmlQU2NUQUhueFF2UnhINWxDcGZ1eWFqcFpBUVRDMGpYdVhzSWdmazNYcmRDeUdOd0xRPSIsIml2UGFyYW1ldGVyU3BlYyI6IjhqZnUxOHpObWFGSnFtUzYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-intel/history)
6-
| CLANG | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicnRqWEh6YUg1UEx2OWE5QVpXb2RjVDFCeitJV3ROaEkxVGVnYnRNYWMzR0J0Z2xPZFhTZlEvVUFiL1BoUjJzcVh3V3BSaTRaSVFnK2dSdGtMcnd5S2o4PSIsIml2UGFyYW1ldGVyU3BlYyI6IjFVTEtZRTNpQXJMR0NYRCsiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-clang/history) | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiL3NrZ05zdXQzbmlhOTJOT0RVanBwKzhocXhIb0tpdnFFMzAzdjd6RmN4V0FpRTJMVkdYcGJoVS9CTlE0L3dXS3JvclZxZU12U0lVWjdBb3krZ2xzODBBPSIsIml2UGFyYW1ldGVyU3BlYyI6IklHcGQ0VUJNOWdzNHNyWE0iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-clang/history)
2+
| Platform | JCSDA-internal |
3+
| ------------- | ------------- |
4+
| GNU | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieXA5WFFUZk5NMDVvV0ZkZVBQUDRVeFN3VDk5aVkvZHJ0K3ZWaEl6RlVZNGdCTEI0Y283QU5TTzVTS0k0N0hNYjl4allwY21SRlFWVjJYTEFjSlJUUlZVPSIsIml2UGFyYW1ldGVyU3BlYyI6ImxZNTZLc3VXcGNVYktCeVQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-gnu/history) |
5+
| Intel | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoidC9ZWmlyNU8xZmdjd0kxbFJzcGVNTlhJSDdBcFJ4RUdwNjNmcnFzQ1VWUUNaMWFEZkwvbHlkZUxTaTZIZlQyWWxOMGtvVzRaTlpRNGdjbFVUK0ZaRDFvPSIsIml2UGFyYW1ldGVyU3BlYyI6IllwQlZTb2JNdnJjOEo5TlgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-intel/history) |v
6+
| CLANG | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicnRqWEh6YUg1UEx2OWE5QVpXb2RjVDFCeitJV3ROaEkxVGVnYnRNYWMzR0J0Z2xPZFhTZlEvVUFiL1BoUjJzcVh3V3BSaTRaSVFnK2dSdGtMcnd5S2o4PSIsIml2UGFyYW1ldGVyU3BlYyI6IjFVTEtZRTNpQXJMR0NYRCsiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-clang/history) |
77
| Code Coverage | [![codecov](https://codecov.io/gh/JCSDA-internal/saber/branch/develop/graph/badge.svg?token=GKZ5TMF2GW)](https://codecov.io/gh/JCSDA-internal/saber) |
88

99
# SABER

0 commit comments

Comments
 (0)