Merge pull request #285 from lsst-ts/tickets/DM-48858

tickets/DM 48858
lsst-ts · Feb 17, 2025 · fd8a0ef · fd8a0ef
2 parents 01e17f1 + c1fcff1
commit fd8a0ef
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 53 deletions.
diff --git a/build/atoods/startup.sh b/build/atoods/startup.sh
@@ -2,8 +2,6 @@
 
 source ${HOME}/.setup_sal_env.sh
 
-unset S3_ENDPOINT_URL
-
 setup lsst_distrib
 setup -t current ctrl_oods
 

diff --git a/build/ccoods/startup.sh b/build/ccoods/startup.sh
@@ -2,8 +2,6 @@
 
 source ${HOME}/.setup_sal_env.sh
 
-unset S3_ENDPOINT_URL
-
 setup lsst_distrib
 setup -t current ctrl_oods
 

diff --git a/build/common/conda_build_config.yaml b/build/common/conda_build_config.yaml
@@ -10,6 +10,8 @@ setuptools:
 setuptools_scm:
   - 7.0
   - 8.1
+idl_version:
+  - ""
 zip_keys:
   - python
   - numpy

diff --git a/build/conda_builder/linux64/setup.sh b/build/conda_builder/linux64/setup.sh
@@ -1,10 +1,3 @@
 source ~/miniconda3/bin/activate
-source ${HOME}/.ospl_env.sh
-source $OSPL_HOME/release.com
-
-export OSPL_URI=$(python -c "from lsst.ts import ddsconfig; print( (ddsconfig.get_config_dir() / 'ospl-std.xml').as_uri())")
-export LSST_DDS_DOMAIN_ID=$(( RANDOM % 230 ))
-export LSST_DDS_HISTORYSYNC=10
-export OSPL_MASTER_PRIORITY=10
 
 /bin/bash --rcfile /home/saluser/.bashrc
diff --git a/build/mtoods/startup.sh b/build/mtoods/startup.sh
@@ -2,8 +2,6 @@
 
 source ${HOME}/.setup_sal_env.sh
 
-unset S3_ENDPOINT_URL
-
 setup lsst_distrib
 setup -t current ctrl_oods
 

diff --git a/build/oods/startup.sh b/build/oods/startup.sh
@@ -3,7 +3,6 @@
 source ${HOME}/.setup_sal_env.sh
 
 LSST_USER_HOME=/home/saluser
-unset S3_ENDPOINT_URL
 
 setup lsst_distrib
 setup obs_lsst

diff --git a/cycle/cycle.env b/cycle/cycle.env
@@ -5,7 +5,7 @@ CYCLE=k0004
 #
 # Revision
 #
-rev=.001
+rev=.002
 #
 # Python version
 #
@@ -34,8 +34,8 @@ B_GID=73006
 #
 # Base image from lsstsqre
 #
-lsstsqre=7-stack-lsst_distrib-w_2025_01
-stack=w_2025_01
+lsstsqre=7-stack-lsst_distrib-w_2025_05
+stack=w_2025_05
 # Base image for Rapid Analysis.
 # TODO: (DM-43475) Resync RA images with the rest of the summit.
 stack_ra=d_2024_07_35
@@ -83,8 +83,8 @@ ts_ofc=4.0.0a10
 ts_phosim=2.3.6
 ts_watcher=1.20.3
 ts_scheduler=2.3.1
-ts_mtdome=2.0.1
-ts_mtdomecom=0.2.0
+ts_mtdome=2.0.3
+ts_mtdomecom=0.2.2
 ts_mtdometrajectory=0.13.3
 ts_dsm=2.5.4
 ts_dimm=0.9.2
@@ -106,16 +106,16 @@ ts_hvac=0.17.3a1
 ts_utils=1.2.7
 ts_electrometer=0.10.0b2
 ts_fiberspectrograph=0.11.1
-ts_weatherforecast=0.5.0a1
+ts_weatherforecast=0.5.0a2
 ts_gis=0.6.0
 robotframework_efd=0.0.1a40
 ts_integrationtests=0.31.0
-oods=9.8.1
+oods=9.8.2
 headerservice=3.4.10
 ts_audio_broadcaster=0.1.3
 rubintv=2.2.0
 ts_nightreport=0.1.3
-ts_tunablelaser=2.2.1
+ts_tunablelaser=2.3.0rc2
 ts_linearstage=2.1.1a1
 ts_cbp=1.5.0
 ts_ledprojector=0.1.0
@@ -149,9 +149,9 @@ ts_config_atcalsys=0.8.0
 ts_config_attcs=0.14.3
 ts_config_eas=0.2.2
 ts_config_latiss=0.7.16
-ts_config_mtcalsys=0.11.3a1
-ts_config_mttcs=0.16.2
-ts_config_ocs=0.27.1
+ts_config_mtcalsys=0.12.0
+ts_config_mttcs=0.16.3
+ts_config_ocs=0.27.2
 dm_config_ocps=4.0.0
 #
 # LOVE components

diff --git a/cycle/docker-compose.yaml b/cycle/docker-compose.yaml
@@ -1,7 +1,3 @@
-networks:
-  kafka:
-    external: true
-
 x-cbp:
   &base-cbp
   build:
@@ -272,11 +268,10 @@ x-love-view-backup:
 
 x-mtaos:
   &base-mtaos
-  networks:
-    - kafka
   build:
     context: ../build/
     dockerfile: ./mtaos/Dockerfile
+    network: kafka
     labels:
       com.description: "MTAOS deployment image for cycle/revision ${CYCLE}${rev}."
     args:
@@ -1017,11 +1012,10 @@ services:
 
   base-sqre-private:
     image: ts-dockerhub.lsst.org/base-sqre:${CYCLE}
-    networks:
-      - kafka
     build:
       context: ../build/
       dockerfile: ./develop-env/lsstsqre/Dockerfile
+      network: kafka
       labels:
         com.description: "LSST Telescope and Site base development for cycle/revision ${CYCLE}."
       args:
@@ -1105,6 +1099,7 @@ services:
     image: lsstts/salobj:${CYCLE}${rev}
     build:
       context: ../build/develop-env/salobj/
+      network: kafka
       labels:
         com.description: LSST Telescope and Site Docker image with SalObj for cycle/revision ${CYCLE}${rev}.
       args:
@@ -1125,10 +1120,9 @@ services:
 
   salobj-private:
     image: ts-dockerhub.lsst.org/salobj:${CYCLE}${rev}
-    networks:
-      - kafka
     build:
       context: ../build/develop-env/salobj/
+      network: kafka
       labels:
         com.description: LSST Telescope and Site Docker image with SalObj for cycle/revision ${CYCLE}${rev}.
       args:
@@ -1172,10 +1166,9 @@ services:
 
   develop-env-private:
     image: ts-dockerhub.lsst.org/develop-env:${CYCLE}${rev}
-    networks:
-      - kafka
     build:
       context: ../build/develop-env/develop-env/
+      network: kafka
       labels:
         com.description: LSST Telescope and Site development environment image for cycle/revision ${CYCLE}${rev}..
       args:

diff --git a/doc/version-history.rst b/doc/version-history.rst
@@ -8,6 +8,31 @@ Version History
 .. No new work should be required in order to complete this section.
 .. Below is an example of a version history format.
 
+Kafka 04 revision 2
+===================
+
+* Removed unset S3_ENDPOINT_URL for oods builds.
+* Updated conda build setup script to remove DDS-related steps.
+* Updated develop-env Jenkinsfile to use DOCKER_BUILDKIT=0, which allows passing the network to the build container.
+* Updated salobj Jenkinsfile to use DOCKER_BUILDKIT=0, which allows passing the network to the build container.
+* Fixed use of external network for docker compose.
+* Added kafka network to the salobj-community build configuration.
+* Updated Sciplat Jenkinsfile to remove old opensplice step that was deprecated for kafka.
+* Added idl_version to conda_build_config.
+
+* Updated version of the following packages:
+
+  * lsstsqre
+  * stack
+  * ts_mtdome
+  * ts_mtdomecom
+  * ts_weatherforecast
+  * oods
+  * ts_tunablelaser
+  * ts_config_mtcalsys
+  * ts_config_mttcs
+  * ts_config_ocs
+
 Kafka 04 revision 0
 ===================
 

diff --git a/jenkins/Jenkinsfile.dev b/jenkins/Jenkinsfile.dev
@@ -25,7 +25,7 @@ pipeline {
                 script {
                   docker.withRegistry("", registryCredential) {
                     sh """
-                      docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull develop-env-community
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull develop-env-community
                     """
                   }
                 }
@@ -48,7 +48,7 @@ pipeline {
                 script {
                   docker.withRegistry("", registryCredential) {
                     sh """
-                      docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull develop-env-community
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull develop-env-community
                     """
                   }
                 }
@@ -71,7 +71,7 @@ pipeline {
                 script {
                   docker.withRegistry("", registryCredential) {
                     sh """
-                      docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull develop-env-community
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull develop-env-community
                     """
                   }
                 }
@@ -94,7 +94,7 @@ pipeline {
                 script {
                   docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                     sh """
-                      docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull develop-env-private
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull develop-env-private
                     """
                   }
                 }
@@ -117,7 +117,7 @@ pipeline {
                 script {
                   docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                     sh """
-                      docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull develop-env-private
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull develop-env-private
                     """
                   }
                 }
@@ -140,7 +140,7 @@ pipeline {
                 script {
                   docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                     sh """
-                      docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull develop-env-private
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull develop-env-private
                     """
                   }
                 }

diff --git a/jenkins/Jenkinsfile.salobj b/jenkins/Jenkinsfile.salobj
@@ -28,7 +28,7 @@ pipeline {
                 script {
                   docker.withRegistry("", registryCredential) {
                     sh """
-                      docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull salobj-community
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull salobj-community
                     """
                   }
                 }
@@ -51,7 +51,7 @@ pipeline {
                 script {
                   docker.withRegistry("", registryCredential) {
                     sh """
-                      docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull salobj-community
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull salobj-community
                     """
                   }
                 }
@@ -74,7 +74,7 @@ pipeline {
                 script {
                   docker.withRegistry("", registryCredential) {
                     sh """
-                      docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull salobj-community
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull salobj-community
                     """
                   }
                 }
@@ -97,7 +97,7 @@ pipeline {
                 script {
                   docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                     sh """
-                      docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull salobj-private
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/main.env -f cycle/docker-compose.yaml build --pull salobj-private
                     """
                   }
                 }
@@ -120,7 +120,7 @@ pipeline {
                 script {
                   docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                     sh """
-                      docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull salobj-private
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/develop.env -f cycle/docker-compose.yaml build --pull salobj-private
                     """
                   }
                 }
@@ -143,7 +143,7 @@ pipeline {
                 script {
                   docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                     sh """
-                      docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull salobj-private
+                      DOCKER_BUILDKIT=0 docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull salobj-private
                     """
                   }
                 }

diff --git a/jenkins/Jenkinsfile.sciplat b/jenkins/Jenkinsfile.sciplat
@@ -25,7 +25,6 @@ pipeline {
               script {
                 docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                   sh """
-                    docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull opensplice-lsstsqre-licensed
                     docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build sal-sciplat-licensed
                   """
                 }
@@ -54,7 +53,6 @@ pipeline {
               script {
                 docker.withRegistry("", registryCredential) {
                   sh """
-                    docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull opensplice-lsstsqre-community
                     docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build sal-sciplat-community
                   """
                 }
@@ -83,7 +81,6 @@ pipeline {
               script {
                 docker.withRegistry("https://ts-dockerhub.lsst.org/", "nexus3-lsst_jenkins") {
                   sh """
-                    docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull opensplice-lsstsqre-licensed
                     docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build sal-sciplat-licensed
                   """
                 }
@@ -112,7 +109,6 @@ pipeline {
               script {
                 docker.withRegistry("", registryCredential) {
                   sh """
-                      docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build --pull opensplice-lsstsqre-community
                       docker compose --env-file cycle/cycle.env -f cycle/docker-compose.yaml build sal-sciplat-community
                   """
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,8 @@ setuptools: @@
     setuptools_scm:
       - 7.0
       - 8.1
+    idl_version:
+      - ""
     zip_keys:
       - python
       - numpy
@@ Expand Down @@