From efce69317c6b74c8f3f5c869efed5bc4f533dd7c Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 7 Feb 2024 13:05:28 +1000 Subject: Feat!: Update JJB version to 6x Jenkins Job Builder 6.0.0 is released and breaks backward compatibility with 5.1.0. The breaking changes with previous 5.1.0 release: - Jobs are now expanded the same way as job templates. - Macros without parameters are now expanded the same way as macros with parameters. - Tags !include-raw: and !include-raw-escape: should now be used the same way in jobs and macros without parameters as they are used in job templates and macros with parameters. - Update pre-commit dependencies Ref: https://storyboard.openstack.org/#!/story/2010963 https://storyboard.openstack.org/#!/story/2010588 NOTE: Set the var "JJB_VERSION" to "6.0.0" at the GH orginazation level for GHA JJB Verify to pick up the latest version of JJB. Issue-ID: CIMAN-33 LF-JIRA RELENG-5131 Change-Id: Icdeecb8bf216ceab4c5af5720f3bd89d3ef2621d Signed-off-by: Anil Belur --- jjb/integration/netconf-pnp-simulator-verify.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'jjb/integration/netconf-pnp-simulator-verify.sh') diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh index 28e8ae3b6..6617f70c3 100644 --- a/jjb/integration/netconf-pnp-simulator-verify.sh +++ b/jjb/integration/netconf-pnp-simulator-verify.sh @@ -25,7 +25,7 @@ DOCKER_COMPOSE_LOG="/tmp/docker-compose.log" DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" ) DOCKER_COMPOSE_SLEEP_INTERVAL=60 -if [ -z ${NETCONF_SIM_SERVICE_NAME} ]; +if [ -z "$NETCONF_SIM_SERVICE_NAME" ]; then echo "ERROR: netconf-pnp-simulator service name not set." exit 1 @@ -34,17 +34,17 @@ fi pushd $DOCKER_ROOT # Dump container logs -sleep ${DOCKER_COMPOSE_SLEEP_INTERVAL} # Hang for a while so the services settle -docker-compose logs --no-color > ${DOCKER_COMPOSE_LOG} +sleep "$DOCKER_COMPOSE_SLEEP_INTERVAL" # Hang for a while so the services settle +docker-compose logs --no-color > "$DOCKER_COMPOSE_LOG" # Get the supervisord services running within container -supervisord_services=($(docker-compose exec -T ${NETCONF_SIM_SERVICE_NAME} /bin/sh -c \ +supervisord_services=($(docker-compose exec -T "$NETCONF_SIM_SERVICE_NAME" /bin/sh -c \ 'cat /etc/supervisord.conf /etc/supervisord.d/*' | grep -ho "program:[-a-zA-Z0-9]*" | cut -d: -f 2)) # Check all services are running and fail if not -for service in ${supervisord_services[@]}; +for service in "${{supervisord_services[@]}}"; do - if ! grep -q "${DOCKER_COMPOSE_LOG_MSG[0]} $service ${DOCKER_COMPOSE_LOG_MSG[1]}" ${DOCKER_COMPOSE_LOG}; + if ! grep -q "${{DOCKER_COMPOSE_LOG_MSG[0]}} $service ${{DOCKER_COMPOSE_LOG_MSG[1]}}" "$DOCKER_COMPOSE_LOG"; then echo "ERROR: Service $service is not running, failing the build." exit 1 -- cgit 1.2.3-korg