Skip to content

Commit c3d046a

Browse files
authored
Add ubuntu 22.04 LTS Jammy to travis (#2090)
Target ubuntu 22.04 LTS Jammy is added to travis. Target Centos (7.6, clang 9.0.0 + gcc 4.9.3, open-mpi 1.10.7) is removed. Auto deployment is done for ubuntu 22.04.
1 parent 748bfa2 commit c3d046a

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

.travis.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: shell
22
os: linux
3-
dist: xenial
3+
dist: focal
44

55
vm:
66
size: large
77

88
env:
99
global:
10-
- GEOSX_TPL_TAG=197-790
10+
- GEOSX_TPL_TAG=200-813
1111
- secure: CGs2uH6efq1Me6xJWRr0BnwtwxoujzlowC4FHXHdWbNOkPsXf7nCgdaW5vthfD3bhnOeEUQSrfxdhTRtyU/NfcKLmKgGBnZOdUG4/JJK4gDSJ2Wp8LZ/mB0QEoODKVxbh+YtoAiHe3y4M9PGCs+wkNDw/3eEU00cK12DZ6gad0RbLjI3xkhEr/ZEZDZkcYg9yHAhl5bmpqoh/6QGnIg8mxIqdAtGDw+6tT0EgUqjeqc5bG5WwsamKzJItHSXD5zx8IJAlgDk4EzEGjZe0m56YnNfb9iwqqUsmL3Cuwgs7ByVDYw78JC5Kv42YqoxA5BxMT2mFsEe37TpYNXlzofU7ma2Duw9DGXWQd4IkTCcBxlyR0I0bfo0TmgO+y7PYG9lIyHPUkENemdozsZcWamqqkqegiEdRhDVYlSRo3mu7iCwTS6ZTALliVyEYjYxYb7oAnR3cNywXjblTCI8oKfgLSY+8WijM9SRl57JruIHLkLMCjmRI+cZBfv5tS2tYQTBPkygGrigrrN77ZiC7/TGyfggSN0+y0oYtOAgqEnBcKcreiibMW7tKcV2Z1RFD9ZvIkSc1EXLUPDP8FX1oyhmqBMqVo8LksrYLDJHQ05+F3YNgl2taSt7uMjQ4e8iZ3/IjFeMnbylDw+cj/RbS520HXsFPbWFm2Pb9pceA9n6GnY=
1212

1313
# The integrated test repository contains large data (using git lfs) and we do not use them here.
@@ -86,10 +86,10 @@ __geosx_osx_build: &__geosx_osx_build
8686
- make -j $(nproc) VERBOSE=1
8787
- ctest -V -E "testUncrustifyCheck|testDoxygenCheck|blt_mpi_smoke"
8888

89-
__geosx_totalenergies_cluster_build: &__geosx_totalenergies_cluster_build
89+
__geosx_auto_deploy: &__geosx_auto_deploy
9090
<<: *__geosx_linux_build
9191
# We use the most recent ubuntu distribution available in travis-ci to ensure maximum support of google cloud's sdk.
92-
dist: bionic
92+
dist: focal
9393
addons:
9494
apt:
9595
sources:
@@ -220,7 +220,7 @@ jobs:
220220
- BUILD_AND_TEST_ARGS="--disable-unit-tests --reduce-install-logs"
221221
- stage: builds
222222
name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 10.2.89p2)
223-
<<: *__geosx_totalenergies_cluster_build
223+
<<: *__geosx_auto_deploy
224224
env:
225225
- DOCKER_REPOSITORY=geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda10.2.89p2
226226
- CMAKE_BUILD_TYPE=Release
@@ -229,15 +229,15 @@ jobs:
229229
- GCP_BUCKET=geosx/Pecan-GPU
230230
- stage: builds
231231
name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
232-
<<: *__geosx_totalenergies_cluster_build
232+
<<: *__geosx_auto_deploy
233233
env:
234234
- DOCKER_REPOSITORY=geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
235235
- CMAKE_BUILD_TYPE=Release
236236
- HOST_CONFIG=host-configs/TOTAL/pecan-CPU.cmake
237237
- GCP_BUCKET=geosx/Pecan-CPU
238238
- stage: builds
239239
name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3)
240-
<<: *__geosx_totalenergies_cluster_build
240+
<<: *__geosx_auto_deploy
241241
env:
242242
- DOCKER_REPOSITORY=geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3
243243
- CMAKE_BUILD_TYPE=Release
@@ -247,12 +247,6 @@ jobs:
247247
- stage: builds
248248
name: Mac_OSX
249249
<<: *__geosx_osx_build
250-
- stage: builds
251-
name: Centos (7.7, clang 9.0.0 + gcc 4.9.3, open-mpi 1.10.7)
252-
<<: *__geosx_linux_build
253-
env:
254-
- DOCKER_REPOSITORY=geosx/centos7.7.1908-clang9.0.0
255-
- CMAKE_BUILD_TYPE=Release
256250
- stage: builds
257251
name: Ubuntu (20.04, gcc 9.3.0, open-mpi 4.0.3)
258252
<<: *__geosx_linux_build
@@ -271,5 +265,12 @@ jobs:
271265
env:
272266
- DOCKER_REPOSITORY=geosx/ubuntu20.04-gcc10
273267
- CMAKE_BUILD_TYPE=Release
268+
- stage: builds
269+
name: Ubuntu (22.04, gcc 11.2.0, open-mpi 4.1.2)
270+
<<: *__geosx_auto_deploy
271+
env:
272+
- DOCKER_REPOSITORY=geosx/ubuntu22.04-gcc11
273+
- CMAKE_BUILD_TYPE=RelWithDebInfo
274+
- GCP_BUCKET=geosx/ubuntu22.04-gcc11
274275
- stage: return_status
275276
<<: *__geosx_return_script

scripts/travis_build_and_test.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ fi
5151
# This will tells OpenMPI to discover the number of hardware threads on the node,
5252
# and use that as the number of slots available. (There is a distinction between threads and cores).
5353
GEOSX_BUILD_DIR=/tmp/build
54-
or_die python scripts/config-build.py \
55-
-hc ${HOST_CONFIG} \
56-
-bt ${CMAKE_BUILD_TYPE} \
57-
-bp ${GEOSX_BUILD_DIR} \
58-
-ip ${GEOSX_DIR} \
59-
-DBLT_MPI_COMMAND_APPEND='"--allow-run-as-root;--oversubscribe"'
54+
or_die python3 scripts/config-build.py \
55+
-hc ${HOST_CONFIG} \
56+
-bt ${CMAKE_BUILD_TYPE} \
57+
-bp ${GEOSX_BUILD_DIR} \
58+
-ip ${GEOSX_DIR} \
59+
-DBLT_MPI_COMMAND_APPEND='"--allow-run-as-root;--oversubscribe"'
6060

6161
or_die cd ${GEOSX_BUILD_DIR}
6262

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ if( ENABLE_XML_UPDATES AND ENABLE_MPI AND UNIX AND NOT CMAKE_HOST_APPLE AND NOT
144144

145145
add_custom_target( geosx_update_rst_tables
146146
ALL
147-
COMMAND python ${SCRIPT_DIR}/SchemaToRSTDocumentation.py ${SCHEMA_DIR} >update_rst_tables.log 2>&1 || (cat update_rst_tables.log && exit 1)
147+
COMMAND python3 ${SCRIPT_DIR}/SchemaToRSTDocumentation.py ${SCHEMA_DIR} >update_rst_tables.log 2>&1 || (cat update_rst_tables.log && exit 1)
148148
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
149149
DEPENDS geosx_generate_schema
150150
COMMENT "Generating schema-dependent RST files"

src/coreComponents/LvArray

src/docs/sphinx/buildGuide/Prerequisites.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ List of prerequisites
1010

1111
Minimal requirements:
1212

13-
- `CMake <https://cmake.org/>`_ build system generator (3.13+).
13+
- `CMake <https://cmake.org/>`_ build system generator (3.17+).
1414
- build tools (`GNU make <https://www.gnu.org/software/make/>`_ or `ninja <https://ninja-build.org/>`_ on Linux, XCode on MacOS).
1515
- a C++ compiler with full c++14 standard support (`gcc <https://gcc.gnu.org/>`_ 8.3+ or `clang <https://clang.llvm.org/>`_ 8.0+ are recommended).
1616
- `python <https://www.python.org/>`_ (2.7+ or 3.6+).

0 commit comments

Comments
 (0)