Skip to content

Connect to kafka network. Update salgenerator steps for kafka. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbovill merged 1 commit into from
May 3, 2025
Merged

Connect to kafka network. Update salgenerator steps for kafka. #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pipeline{
docker {
image 'ts-dockerhub.lsst.org/salobj:' + params.image_version
args '--entrypoint="" ' +
'-e LSST_DDS_PARTITION_PREFIX=citest -v ${WORKSPACE}:' + HOME + '/repos/ts_SalMultiLanguageTests '
'--network=kafka -v ${WORKSPACE}:' + HOME + '/repos/ts_SalMultiLanguageTests '
label 'Node1_4CPU || Node3_4CPU'
}
}
Expand All @@ -25,16 +25,14 @@ pipeline{
stages{
stage("Build Test CSC libraries") {
steps {
withEnv(["HOME=/home/saluser"]) {
withEnv(["HOME=${env.WORKSPACE}"]) {
sh """
echo 'Setup the environment'
set +x
source $HOME/.setup.sh
export LSST_SDK_INSTALL=/home/saluser/repos/ts_sal
export LSST_SAL_PREFIX=\$CONDA_PREFIX
set -x
echo 'Update ts_idl/develop'
cd $HOME/repos/ts_idl
/home/saluser/.checkout_repo.sh develop
git pull
echo 'Update ts_xml/develop'
cd $HOME/repos/ts_xml
/home/saluser/.checkout_repo.sh develop
Expand All @@ -43,6 +41,8 @@ pipeline{
cd $HOME/repos/ts_sal
/home/saluser/.checkout_repo.sh develop
git pull
./bin/setupStackBuildEnvironment
source ./setupKafka.env
cd test
echo 'Log EnvVars'
echo 'PATH: \$PATH'
Expand All @@ -52,13 +52,9 @@ pipeline{
cp -r \${TS_XML_DIR}/python/lsst/ts/xml/data/sal_interfaces/SALSubsystems.xml $HOME/repos/ts_sal/test
cp -r \${TS_XML_DIR}/python/lsst/ts/xml/data/sal_interfaces/SALGenerics.xml $HOME/repos/ts_sal/test
echo 'Validate and IDL'
make_idl_files.py --keep Test
salgenerator validate Test
echo 'C++'
salgenerator Test sal cpp
echo 'Java'
salgenerator Test sal java version=pre${BUILD_NUMBER}-SNAPSHOT
echo 'Maven'
salgenerator Test maven version=pre${BUILD_NUMBER}-SNAPSHOT
echo 'Lib'
salgenerator Test lib
echo 'Copy controllers'
Expand All @@ -76,7 +72,7 @@ pipeline{
source $HOME/.setup.sh
set -x
pip install .
pytest -ra -o junit_family=xunit2 --junitxml=tests/results/results.xml
#pytest -ra tests/test_salcommander_minimal_controllers.py tests/test_salobj_to_minimal_controllers.py -o junit_family=xunit2 --junitxml=tests/results/results.xml
echo "====== Unit testing complete ======"
"""
}
Expand Down