Update Fedora build envs

envs/fedora/29/Dockerfile

@@ -21,6 +21,7 @@ RUN pip install gcovr
 
 RUN dnf update -y && dnf install -y texlive
 RUN dnf update -y && dnf install -y cmake
+RUN dnf update -y && dnf install -y ninja-build
 
 ENV MODULEPATH /etc/modulefiles:/usr/share/modulefiles:/usr/share/Modules/modulefiles
 ENV PATH /usr/lib/ccache:$PATH

envs/fedora/29_cross/Dockerfile

@@ -1,7 +1,7 @@
 FROM fedora:29
 
 RUN dnf update -y
-RUN dnf install -y make python3 python3-virtualenv python3-nose python3-pip ccache git patch dos2unix openssh which wget Lmod texlive cmake gcc
+RUN dnf install -y make python3 python3-virtualenv python3-nose python3-pip ccache git patch dos2unix openssh which wget Lmod texlive cmake gcc ninja-build
 RUN dnf install -y mingw32-nsis mingw32-gcc-c++ mingw32-gcc-gfortran mingw32-libjpeg-turbo-static mingw32-libpng-static mingw32-zlib-static mingw32-libgomp mingw32-winpthreads-static
 RUN dnf install -y mingw64-gcc-c++ mingw64-gcc-gfortran mingw64-libjpeg-turbo-static mingw64-libpng-static mingw64-zlib-static mingw64-libgomp mingw64-winpthreads-static
 

envs/fedora/28/Dockerfile → envs/fedora/30/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:30
 
 RUN dnf update -y && dnf groupinstall -y "Development tools"
 RUN dnf install -y openmpi openmpi-devel
@@ -21,12 +21,13 @@ RUN pip install gcovr
 
 RUN dnf update -y && dnf install -y texlive
 RUN dnf update -y && dnf install -y cmake
+RUN dnf update -y && dnf install -y ninja-build
 
 ENV MODULEPATH /etc/modulefiles:/usr/share/modulefiles:/usr/share/Modules/modulefiles
 ENV PATH /usr/lib/ccache:$PATH
 
 RUN groupadd -g 114 jenkins
-RUN useradd -u 106 -g 114 -ms /bin/bash jenkins
+RUN useradd -u 108 -g 114 -ms /bin/bash jenkins
 
 COPY z00_StdEnv.sh /etc/profile.d/z00_StdEnv.sh
 

envs/fedora/30_cross/Dockerfile

@@ -0,0 +1,22 @@
+FROM fedora:30
+
+RUN dnf update -y
+RUN dnf install -y make python3 python3-virtualenv python3-nose python3-pip ccache git patch dos2unix openssh which wget Lmod texlive cmake gcc ninja-build
+RUN dnf install -y mingw32-nsis mingw32-gcc-c++ mingw32-gcc-gfortran mingw32-libjpeg-turbo-static mingw32-libpng-static mingw32-zlib-static mingw32-libgomp mingw32-winpthreads-static
+RUN dnf install -y mingw64-gcc-c++ mingw64-gcc-gfortran mingw64-libjpeg-turbo-static mingw64-libpng-static mingw64-zlib-static mingw64-libgomp mingw64-winpthreads-static
+
+RUN pip3 install --upgrade pip virtualenv
+
+RUN mkdir -p /tmp/dl && cd /tmp/dl && wget https://download.lammps.org/thirdparty/opencl-win-devel.tar.gz && tar -xzvf opencl-win-devel.tar.gz && cp -ar OpenCL/include/CL /usr/i686-w64-mingw32/sys-root/mingw/include/  && cp -ar OpenCL/include/CL /usr/x86_64-w64-mingw32/sys-root/mingw/include/ && cp OpenCL/lib_win32/libOpenCL.dll /usr/i686-w64-mingw32/sys-root/mingw/lib  && cp OpenCL/lib_win64/libOpenCL.dll /usr/x86_64-w64-mingw32/sys-root/mingw/lib && cd && rm -rf /tmp/dl
+
+ENV MODULEPATH /etc/modulefiles:/usr/share/modulefiles:/usr/share/Modules/modulefiles
+ENV PATH /usr/lib/ccache:$PATH
+
+RUN groupadd -g 114 jenkins
+RUN useradd -u 108 -g 114 -ms /bin/bash jenkins
+
+COPY z00_StdEnv.sh /etc/profile.d/z00_StdEnv.sh
+
+USER jenkins
+
+CMD /bin/bash

envs/fedora/rawhide/z00_StdEnv.sh → envs/fedora/30_cross/z00_StdEnv.sh

@@ -1,5 +1,4 @@
 if [ -z "$__Init_Default_Modules" -o -z "$LD_LIBRARY_PATH" ]; then
   __Init_Default_Modules=1; export __Init_Default_Modules;
   module getdefault default
-  module load mpi
 fi

pipelines/build-envs/fedora_28.groovy → pipelines/build-envs/fedora/29_cross.groovy

@@ -1,6 +1,6 @@
 node {
     def os = 'fedora'
-    def version = 28
+    def version = '30_cross'
 
     stage('Checkout') {
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], userRemoteConfigs: [[url: 'https://github.com/lammps/lammps-testing.git', credentialsId: 'lammps-jenkins']],
@@ -9,9 +9,9 @@ node {
     }
 
 
-    docker.withRegistry('https://registry.hub.docker.com', 'docker-registry-login') {
+    docker.withRegistry('http://glados2.cst.temple.edu:5000') {
         dir('envs/' + os + '/' + version + '/') {
-            def image_name = 'rbberger/lammps-testing:' + os + '_' + version
+            def image_name = 'lammps_testing:' + os + '_' + version
 
             stage 'Build'
             docker.build(image_name)

pipelines/build-envs/fedora_27.groovy → pipelines/build-envs/fedora/30.groovy

@@ -1,6 +1,6 @@
 node {
     def os = 'fedora'
-    def version = 27
+    def version = 29
 
     stage('Checkout') {
         checkout([$class: 'GitSCM', branches: [[name: '*/master']], userRemoteConfigs: [[url: 'https://github.com/lammps/lammps-testing.git', credentialsId: 'lammps-jenkins']],
@@ -9,9 +9,9 @@ node {
     }
 
 
-    docker.withRegistry('https://registry.hub.docker.com', 'docker-registry-login') {
+    docker.withRegistry('http://glados2.cst.temple.edu:5000') {
         dir('envs/' + os + '/' + version + '/') {
-            def image_name = 'rbberger/lammps-testing:' + os + '_' + version
+            def image_name = 'lammps_testing:' + os + '_' + version
 
             stage 'Build'
             docker.build(image_name)

pipelines/build-envs/jobs.dsl

@@ -2,7 +2,11 @@ folder('build-envs') {
   description('We use Docker images to set up our various build environments. These projects build the docker images and publish them on DockerHub.')
 }
 
-def scripts = ['fedora_29', 'fedora_29_cross', 'ubuntu_latest', 'ubuntu_18.04_cuda_10.0', 'centos_7']
+folder('build-envs/fedora') {
+  description('We use Docker images to set up our various build environments. These projects build the docker images and publish them on DockerHub.')
+}
+
+def scripts = ['fedora/29', 'fedora/29_cross', 'fedora/30', 'fedora/30_cross', 'ubuntu_latest', 'ubuntu_18.04_cuda_10.0', 'centos_7']
 
 scripts.each { name ->
     pipelineJob("build-envs/${name}") {