small cloud tuning from Greg Thompson

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url =  https://github.com/grantfirl/fv3atm
+  branch = small_cloud_tuning_GT_gjf
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

tests/ci/Jenkinsfile

@@ -48,27 +48,49 @@ pipeline {
                     }
                 }
 
+                agent {
+                    label 'docker-ufs-wm-ci'
+                }
+
+                environment {
+                    IMG_NAME = 'ci-test-weather'
+                }
+
                 stages {
-                    stage('Test') {
-                        when {
-                            expression {
-                                !changeRequest()
-                            }
+                    stage('Initialize') {
+                        steps {
+                            cleanWs()
+                            checkout scm
                         }
+                    }
 
+                    stage('Build') {
                         steps {
-                            build job: 'ufs-weather-model/ort-docker-pipeline', parameters: [string(name: 'TEST_NAME', value: "${env.TEST_NAME}"), string(name: 'TEST_CASE', value: "${env.TEST_CASE}"), string(name: 'WRAPPER_GIT_BRANCH', value: "${env.BRANCH_NAME}")]
+                            sh 'docker build --build-arg test_name="" --build-arg build_case="" --no-cache --compress --file "${WORKSPACE}/tests/ci/Dockerfile" --tag "${IMG_NAME}" "${WORKSPACE}"'
                         }
                     }
 
-                    stage('Test for Change Request') {
-                        when { changeRequest() }
+                    stage('Stage Test Data') {
+                        steps {
+                            sh 'docker volume rm --force DataVolume && docker run --detach --rm --volume DataVolume:/tmp noaaepic/input-data:20220414'
+                        }
+                    }
 
+                    stage('Test') {
                         steps {
-                            build job: 'ufs-weather-model/ort-docker-pipeline', parameters: [string(name: 'TEST_NAME', value: "${env.TEST_NAME}"), string(name: 'TEST_CASE', value: "${env.TEST_CASE}"), booleanParam(name: 'WRAPPER_CHANGE_REQUEST', value: true), string(name: 'WRAPPER_GIT_BRANCH', value: "${env.CHANGE_TARGET}"), string(name: 'WRAPPER_CHANGE_BRANCH', value: "${env.CHANGE_BRANCH}"), string(name: 'WRAPPER_CHANGE_FORK', value: "${env.CHANGE_FORK}")]
+                            sh 'docker run --rm --env test_name="${TEST_NAME}" --env run_case="${TEST_CASE}" --workdir /home/builder/ufs-weather-model/tests --volume DataVolume:/home/builder/data/NEMSfv3gfs --interactive --shm-size=512m "${IMG_NAME}"'
                         }
                     }
                 }
+
+                post {
+                    always {
+                        sh '''
+                            docker rmi -f "$(docker image ls | grep -E -m1 "${IMG_NAME}" | awk '{ print $3 }')"
+                            docker rmi -f "$(docker image ls | grep -E -m1 'noaaepic' | awk '{ print $3 }')"
+                        '''
+                    }
+                }
             }
         }
     }

tests/rt.sh

@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221012
+BL_DATE=20221017
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}