Skip to content
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

Miscelaneous leftover azure transition pieces #1753

Merged
merged 1 commit into from
Sep 18, 2019
Merged

Miscelaneous leftover azure transition pieces #1753

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
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 @@ -15,19 +15,19 @@ pr:
resources:
containers:
- container: el7
image: ornladios/adios2:el7
image: ornladios/adios2-auto:el7
- container: el7-gnu8-ohpc
image: ornladios/adios2:el7-gnu8-ohpc
image: ornladios/adios2-auto:el7-gnu8-ohpc
- container: el7-gnu8-openmpi-ohpc
image: ornladios/adios2:el7-gnu8-openmpi-ohpc
image: ornladios/adios2-auto:el7-gnu8-openmpi-ohpc
- container: el7-intel18-ohpc
image: ornladios/adios2:el7-intel18-ohpc
image: ornladios/adios2-auto:el7-intel18-ohpc
- container: el7-intel18-openmpi-ohpc
image: ornladios/adios2:el7-intel18-openmpi-ohpc
image: ornladios/adios2-auto:el7-intel18-openmpi-ohpc
- container: suse-pgi
image: ornladios/adios2:suse-pgi
image: ornladios/adios2-auto:suse-pgi
- container: suse-pgi-openmpi
image: ornladios/adios2:suse-pgi-openmpi
image: ornladios/adios2-auto:suse-pgi-openmpi

strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/images/el7-gnu8-openmpi-ohpc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN curl -O https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4
cd hdf5-1.10.4 && \
source /etc/profile && \
module load gnu8 openmpi3 && \
export CC=gcc CXX=g++ FC=gfortran && \
export CC=mpicc CXX=mpicxx FC=mpif90 && \
./configure --prefix=/opt/hdf5/1.10.4 --enable-shared --disable-static --enable-parallel && \
make -j$(grep -c '^processor' /proc/cpuinfo) install && \
cd .. && \
Expand Down
10 changes: 8 additions & 2 deletions scripts/ci/runOnAzure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ then
fi

export CI_SITE_NAME="Azure Pipelines"
export CI_BUILD_NAME="pr${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}_${SYSTEM_PULLREQUEST_SOURCEBRANCH}_${BUILD_BUILDID}_${CONTAINERRESOURCE}"
if [ -n "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}" ]
then
export CI_BUILD_NAME="pr${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}_${SYSTEM_PULLREQUEST_SOURCEBRANCH}_${BUILD_BUILDID}_${CONTAINERRESOURCE}"
export CI_COMMIT=${SYSTEM_PULLREQUEST_SOURCECOMMITID}
else
export CI_BUILD_NAME="${BUILD_SOURCEBRANCHNAME}_${BUILD_BUILDID}_${CONTAINERRESOURCE}"
export CI_COMMIT=${BUILD_SOURCEVERSION}
fi
export CI_ROOT_DIR="${PIPELINE_WORKSPACE}"
export CI_SOURCE_DIR="${BUILD_SOURCESDIRECTORY}"
export CI_BIN_DIR="${BUILD_BINARIESDIRECTORY}/${CONTAINERRESOURCE}"
export CI_COMMIT=$(echo "${BUILD_SOURCEVERSIONMESSAGE}" | awk '{print $2}')


STEP=$1
Expand Down