Merge pull request #1753 from chuckatkins/move-docker-images-to-auto

Miscelaneous leftover azure transition pieces
ornladios · Sep 18, 2019 · 7bd8b1f · 7bd8b1f
2 parents b2c97e1 + fd9b5f9
commit 7bd8b1f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -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:

diff --git a/scripts/ci/images/el7-gnu8-openmpi-ohpc/Dockerfile b/scripts/ci/images/el7-gnu8-openmpi-ohpc/Dockerfile
@@ -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 .. && \

diff --git a/scripts/ci/runOnAzure.sh b/scripts/ci/runOnAzure.sh
@@ -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