Merge pull request #835 from NREL/3.11.0

3.11.0

Author: brianlball

.github/workflows/openstudio-server-tests.yml

@@ -10,16 +10,16 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.10.0
-  OPENSTUDIO_VERSION_SHA: 86d7e215a1
+  OPENSTUDIO_VERSION: 3.11.0
+  OPENSTUDIO_VERSION_SHA: 241b8abb4d
   OPENSTUDIO_VERSION_EXT: ""
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
 
 jobs:
   linux-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Delete huge unnecessary tools folder
       run: rm -rf /opt/hostedtoolcache 
@@ -56,7 +56,7 @@ jobs:
         name: openstudio-server-gems-linux
         path: build/NREL/export/*.tar.gz
   macos-test:
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps: 
     - name: Check out repository
       uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
         name: openstudio-server-gems-darwin
         path: build/NREL/export/*.tar.gz
   docker:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Delete huge unnecessary tools folder
       run: rm -rf /opt/hostedtoolcache 
@@ -105,7 +105,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.10.0
+          export OPENSTUDIO_TAG=3.11.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all
@@ -131,7 +131,7 @@ jobs:
       if: | 
         github.ref == 'refs/heads/master' || 
         github.ref == 'refs/heads/develop' ||
-        github.ref == 'refs/heads/custom_gems'
+        github.ref == 'refs/heads/3.11.0'
       shell: bash
       run: ./docker/deployment/scripts/deploy_docker_github_actions.sh
       env: 

.github/workflows/security-scan.yml

@@ -10,16 +10,16 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.10.0
-  OPENSTUDIO_VERSION_SHA: 86d7e215a1
+  OPENSTUDIO_VERSION: 3.11.0
+  OPENSTUDIO_VERSION_SHA: 241b8abb4d
   OPENSTUDIO_VERSION_EXT: ""
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
 
 jobs:
   docker-scan:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps: 
     - name: Check out repository
       uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.10.0
+          export OPENSTUDIO_TAG=3.11.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all

CHANGELOG.md

@@ -1,6 +1,18 @@
 OpenStudio Server
 =================
 
+Version 3.11.0
+-------------
+* Bumped OpenStudio Server version to 3.11.0.
+* Updated CI and build infrastructure to support newer platforms:
+* Migrated Ubuntu CI from 22.04 to 24.04.
+* Updated macOS runner and version checks to support macOS 15.
+* Updated MongoDB version used in CI to 8.x.
+* Updated container tags and packaging logic for modern OS targets.
+* Updated packaged Ruby and dependency handling for Ubuntu 24.04.
+* Adjusted test expectations in docker_stack_requeue_spec.rb to reflect updated behavior.
+* Cleaned up legacy Windows install and packaging logic.
+
 Version 3.10.0
 -------------
 * Custom Gems working again https://github.com/NREL/OpenStudio-server/pull/818
@@ -11,7 +23,7 @@ Version 3.10.0
 * Local Server startup enhancements for PAT https://github.com/NREL/OpenStudio-server/pull/827
 
 
-Version 3.9.0-rc3
+Version 3.9.0
 -------------
 * 3.9.0 was pulled and several RCs were tried to fix various issues.  This was the last RC before we ran out of funding for the release cycle.
 * Custom Gems have not worked since Ruby 3 upgrade (3.8.0)

Dockerfile

@@ -4,16 +4,16 @@
 # NOTES:            Currently this is one big dockerfile and non-optimal.
 
 #may include suffix
-ARG OPENSTUDIO_VERSION=3.10.0
-FROM nrel/openstudio:3.10.0 AS base
+ARG OPENSTUDIO_VERSION=3.11.0
+FROM nrel/openstudio:3.11.0 AS base
 ARG OPENSTUDIO_VERSION
 
 ENV DEBIAN_FRONTEND=noninteractive
 # Install required libaries.
 #   realpath - needed for wait-for-it
 RUN apt-get update && apt-get install -y wget gnupg lsb-release \
-    && wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | gpg --dearmor | tee /usr/share/keyrings/mongodb-org-6.0-archive-keyring.gpg \
-    && echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-org-6.0-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list \
+    && wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | gpg --dearmor | tee /usr/share/keyrings/mongodb-org-8.0-archive-keyring.gpg \
+    && echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-org-8.0-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         mongodb-org \

README.md

@@ -31,7 +31,7 @@ fundamentals.
 
 The [openstudio_meta](./bin/openstudio_meta) file is a ruby script which provides access to packaging and execution 
 commands which allow for this codebase to be embedded in applications deployed to computers without docker. Deployment 
-requires that [MongoDB 6.0.7](https://www.mongodb.com/download-center/community/releases/archive) and [Ruby v2.7](https://www.ruby-lang.org/en/downloads/) 
+requires that [MongoDB 8.0.12](https://www.mongodb.com/download-center/community/releases/archive) and [Ruby v3.2](https://www.ruby-lang.org/en/downloads/) 
 are additionally packaged. 
 
 The openstudio_meta deployment relies on the `install_gems` command, which uses local system libraries to build all 

appveyor.yml

@@ -4,8 +4,8 @@ image: Visual Studio 2019
 
 environment:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.10.0
-  OPENSTUDIO_VERSION_SHA: 86d7e215a1
+  OPENSTUDIO_VERSION: 3.11.0
+  OPENSTUDIO_VERSION_SHA: 241b8abb4d
   OPENSTUDIO_VERSION_EXT: ""
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   BUILD_TYPE: "test"
@@ -16,7 +16,7 @@ artifacts:
     name: oss.tar.gz
 
 init:
-  #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+ # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 clone_folder: C:\projects\openstudio-server
 

ci/appveyor/install-windows.qs

@@ -20,34 +20,16 @@ if %ERRORLEVEL% neq 0 (
 dir .
 
 REM  “Unblock” the file so Windows does not refuse to execute it
-powershell -Command "Unblock-File -Path '%OS_INSTALL_NAME%'"
-
-REM Execute the OpenStudio installer
-REM %OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs
-REM  3) Run the OpenStudio installer in “quiet” mode, pointing to our QScript
-echo Launching installer…
-REM  Use “.\” to ensure we’re running the downloaded EXE in the current directory
-start "" /wait "%OS_INSTALL_NAME%" --script ci/appveyor/install-windows.qs
+powershell -Command "Unblock-File -Path '%CD%\%OS_INSTALL_NAME%'"
+
+echo Execute the OpenStudio installer
+"%OS_INSTALL_NAME%" /S /D=C:\projects\openstudio
 if %ERRORLEVEL% neq 0 (
   echo.
   echo ERROR: OpenStudio installer "%OS_INSTALL_NAME%" returned error code %ERRORLEVEL%. Aborting.
   exit /b 1
 )
 
-REM move C:\openstudio C:\projects\openstudio
-REM  4) Move the default “C:\openstudio” install directory into the projects dir
-if exist C:\openstudio (
-  move /Y C:\openstudio C:\projects\openstudio
-  if %ERRORLEVEL% neq 0 (
-    echo.
-    echo ERROR: Could not move “C:\openstudio” to “C:\projects\openstudio”. Check permissions.
-    exit /b 1
-  )
-) else (
-  echo.
-  echo ERROR: After running the installer, “C:\openstudio” was not found. Aborting.
-  exit /b 1
-)
 dir C:\projects\openstudio
 
 REM Cleanup installer

ci/appveyor/setup.cmd

@@ -8,7 +8,7 @@ OPENSTUDIO_VERSION_EXT="${3:-}"
 
 if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
     # OPENSTUDIO_VERSION_EXT may be empty
-    OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_SHA}-Ubuntu-22.04-x86_64.deb
+    OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_SHA}-Ubuntu-24.04-x86_64.deb
     echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}"
     #OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop
     #OPENSTUDIO_DOWNLOAD_BASE_URL=https://github.com/NREL/OpenStudio/releases/download/v3.8.0

ci/github-actions/install_openstudio.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 echo "The build architecture is ${ImageOS}"
 
-if [ "${ImageOS}" == "ubuntu22" ] && [ "${BUILD_TYPE}" == "docker" ]; then
+if [ "${ImageOS}" == "ubuntu24" ] && [ "${BUILD_TYPE}" == "docker" ]; then
     echo "Installing docker compose"
     sudo rm -f /usr/local/bin/docker-compose
     curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
@@ -14,7 +14,7 @@ if [ "${ImageOS}" == "ubuntu22" ] && [ "${BUILD_TYPE}" == "docker" ]; then
 
 else
     # sudo rvm implode --force  # rvm PATH rewriting interferes with portable Ruby.
-    if [ "${ImageOS}" == "macos13" ]; then
+    if [ "${ImageOS}" == "macos15" ]; then
 
         brew update > $GITHUB_WORKSPACE/spec/files/logs/brew-update.log
         brew install pv tree coreutils shared-mime-info
@@ -33,14 +33,14 @@ else
         rm ruby-3.2.2-darwin.tar.gz
 
         # Install mongodb from a download. Brew is hanging and requires building mongo. This also speeds up the builds.
-        curl -SLO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-6.0.7.tgz
-        tar xvzf mongodb-macos-x86_64-6.0.7.tgz
+        curl -SLO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-8.0.12.tgz
+        tar xvzf mongodb-macos-x86_64-8.0.12.tgz
         exit_status_tar=$?
         if [ $exit_status_tar -ne 0 ]; then
-         echo "Error: Failed to extract Mongo 6.0.7 archive"
+         echo "Error: Failed to extract Mongo 8.0.12 archive"
          exit $exit_status_tar
         fi
-        sudo cp mongodb-macos-x86_64-6.0.7/bin/* /usr/local/bin/
+        sudo cp mongodb-macos-x86_64-8.0.12/bin/* /usr/local/bin/
         rm -r mongodb-macos*
 
         # Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed
@@ -83,16 +83,14 @@ else
         ulimit -n 4096
         ulimit -a
 
-    elif [ "${ImageOS}" == "ubuntu22" ]; then
+    elif [ "${ImageOS}" == "ubuntu24" ]; then
         echo "Setting up Ubuntu for unit tests and Rubocop"
         # install pipe viewer to throttle printing logs to screen (not a big deal in linux, but it is in osx)
         sudo apt-get update && sudo apt-get install -y wget gnupg software-properties-common build-essential
-        #sudo wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
-        #echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse | tee /etc/apt/sources.list.d/mongodb-org-6.0.list"
         # Import MongoDB public GPG key
-        sudo wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | gpg --dearmor | sudo tee /usr/share/keyrings/mongodb-org-6.0-archive-keyring.gpg
+        sudo wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | gpg --dearmor | sudo tee /usr/share/keyrings/mongodb-org-8.0-archive-keyring.gpg
         # Add MongoDB to the sources list
-        echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-org-6.0-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
+        echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-org-8.0-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
 
         sudo apt-get update
         sudo apt-get install -y pv tree mongodb-org libqdbm14 libxml2-dev
@@ -113,8 +111,9 @@ else
 
         # install portable ruby - required for build that will eventually be published
         # see https://github.com/NREL/OpenStudio-PAT/wiki/Pat-Build-Notes
-        curl -SLO --insecure https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-3.2.2-linux.tar.gz
-        tar xvzf ruby-3.2.2-linux.tar.gz
+        #curl -SLO --insecure https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-3.2.2-linux.tar.gz
+        curl -SLO --insecure https://openstudio-resources.s3.us-east-1.amazonaws.com/pat-dependencies3/ruby-3.2.2-ubuntu24.04-x86_64.tar.gz                             
+        tar xvzf ruby-3.2.2-ubuntu24.04-x86_64.tar.gz 
         exit_status_tar=$?
         if [ $exit_status_tar -ne 0 ]; then
          echo "Error: Failed to extract Ruby 3.2.2 archive"
@@ -124,7 +123,7 @@ else
         sudo rm -rf /usr/local/ruby
         sudo mv ruby /usr/local/
         ldd /usr/local/ruby/bin/ruby
-        rm ruby-3.2.2-linux.tar.gz
+        rm ruby-3.2.2-ubuntu24.04-x86_64.tar.gz 
 
         mkdir -p reports/rspec
         sudo ./ci/github-actions/install_openstudio.sh $OPENSTUDIO_VERSION $OPENSTUDIO_VERSION_SHA $OPENSTUDIO_VERSION_EXT
@@ -145,6 +144,13 @@ else
     # test openssl
     ruby ${GITHUB_WORKSPACE}/ci/github-actions/verify_openstudio.rb
 
+    #DEBUG shared libraries in packaged ruby
+    ruby -v
+    echo "=== RBCONFIG SNAPSHOT ==="
+    ruby -rrbconfig -e 'p RbConfig::CONFIG.values_at("ruby_version","arch","LIBRUBYARG_SHARED","LIBRUBYARG_STATIC","LIBRUBY_SO","LIBRUBY_A","libdir","rubylibdir","archdir")'
+    echo "=== /usr/local/ruby/lib ==="
+    ls -la /usr/local/ruby/lib || true
+
     ruby "${GITHUB_WORKSPACE}/bin/openstudio_meta" install_gems --with_test_develop --debug --verbose --use_cached_gems
     bundle -v
     # create dir for output files which will be generated in case of failure