From: guillaume.lambert Date: Tue, 16 Aug 2022 09:34:59 +0000 (+0200) Subject: Chore: migrate some scripts shebang to sh X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F102083%2F1;p=releng%2Fbuilder.git Chore: migrate some scripts shebang to sh There is no reason to force the use of bash in scripts w/o any bashism. Shell scripts w/o shebangs may behave unpredictably during migrations. Signed-off-by: guillaume.lambert Change-Id: Idc765b4e95b300ccefc86b8649dcb291dc1cafeb --- diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh index c7f45cb64..2b3fc3066 100644 --- a/jenkins-config/global-vars-releng.sh +++ b/jenkins-config/global-vars-releng.sh @@ -1,3 +1,5 @@ +#!/bin/sh + CONTAINER_PULL_REGISTRY=nexus3.opendaylight.org:10003 CONTAINER_PUSH_REGISTRY=nexus3.opendaylight.org:10002 DOCKER_REGISTRY=nexus3.opendaylight.org diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index 939673443..c65dc7703 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -1,3 +1,5 @@ +#!/bin/sh + CONTAINER_PULL_REGISTRY=nexus3.opendaylight.org:10003 CONTAINER_PUSH_REGISTRY=nexus3.opendaylight.org:10002 DOCKER_REGISTRY=nexus3.opendaylight.org diff --git a/jenkins-init-scripts/builder.sh b/jenkins-init-scripts/builder.sh index 367451f56..b27028b25 100755 --- a/jenkins-init-scripts/builder.sh +++ b/jenkins-init-scripts/builder.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # vim: sw=2 ts=2 sts=2 et : yum clean all diff --git a/jenkins-init-scripts/devstack.sh b/jenkins-init-scripts/devstack.sh index d8a873276..02f079604 100755 --- a/jenkins-init-scripts/devstack.sh +++ b/jenkins-init-scripts/devstack.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # It looks like the devstack gate is stomping on our dnsmasq setup which # therefore kills our ability to do proper lookups of some resources. diff --git a/jenkins-init-scripts/docker.sh b/jenkins-init-scripts/docker.sh index d8963184c..7fa0825c8 100755 --- a/jenkins-init-scripts/docker.sh +++ b/jenkins-init-scripts/docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # make sure we don't require tty for sudo operations cat </etc/sudoers.d/89-jenkins-user-defaults diff --git a/jenkins-init-scripts/mininet-ubuntu.sh b/jenkins-init-scripts/mininet-ubuntu.sh index 7f0cd569e..5feab2091 100755 --- a/jenkins-init-scripts/mininet-ubuntu.sh +++ b/jenkins-init-scripts/mininet-ubuntu.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # make sure we don't require tty for sudo operations cat </etc/sudoers.d/89-jenkins-user-defaults diff --git a/jenkins-init-scripts/robot.sh b/jenkins-init-scripts/robot.sh index 5fc0579d8..ab1303886 100755 --- a/jenkins-init-scripts/robot.sh +++ b/jenkins-init-scripts/robot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # make sure we don't require tty for sudo operations cat </etc/sudoers.d/89-jenkins-user-defaults diff --git a/jjb/autorelease/autorelease-get-integration-test-variables.sh b/jjb/autorelease/autorelease-get-integration-test-variables.sh index 95ff652ae..d309744a4 100644 --- a/jjb/autorelease/autorelease-get-integration-test-variables.sh +++ b/jjb/autorelease/autorelease-get-integration-test-variables.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2015, 2016 The Linux Foundation and others. diff --git a/jjb/integration/distribution/distribution-delete-snaphot-artifacts.sh b/jjb/integration/distribution/distribution-delete-snaphot-artifacts.sh index 825023d31..b0ca5ae6b 100644 --- a/jjb/integration/distribution/distribution-delete-snaphot-artifacts.sh +++ b/jjb/integration/distribution/distribution-delete-snaphot-artifacts.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/sh -x # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. diff --git a/jjb/integration/integration-cleanup-tmp.sh b/jjb/integration/integration-cleanup-tmp.sh index eda0da905..cda9a6309 100644 --- a/jjb/integration/integration-cleanup-tmp.sh +++ b/jjb/integration/integration-cleanup-tmp.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/sh + echo "Cleaning up Robot installation..." # ${ROBOT_VENV} comes from the integration-install-robotframework.sh diff --git a/jjb/integration/integration-cleanup-workspace.sh b/jjb/integration/integration-cleanup-workspace.sh index f824262ae..c7cecef61 100644 --- a/jjb/integration/integration-cleanup-workspace.sh +++ b/jjb/integration/integration-cleanup-workspace.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/bin/sh + echo "Cleaning up the workspace..." # Leftover files from previous runs could be wrongly copied as results. diff --git a/jjb/integration/integration-get-apex-addresses.sh b/jjb/integration/integration-get-apex-addresses.sh index 005df5541..6606860dd 100644 --- a/jjb/integration/integration-get-apex-addresses.sh +++ b/jjb/integration/integration-get-apex-addresses.sh @@ -1,4 +1,4 @@ -#!/bin/bash -l +#!/bin/sh -l # Get the Controller and Tools VM slave addresses set -ex -o pipefail diff --git a/jjb/integration/integration-rebase-gerrit-patch.sh b/jjb/integration/integration-rebase-gerrit-patch.sh index b1fbae329..ceb3457a7 100644 --- a/jjb/integration/integration-rebase-gerrit-patch.sh +++ b/jjb/integration/integration-rebase-gerrit-patch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Make sure changes merged after patch creation are applied. set -exu diff --git a/jjb/opendaylight-infra-deploy-maven-site.sh b/jjb/opendaylight-infra-deploy-maven-site.sh index 03d5c3d1b..d27109499 100644 --- a/jjb/opendaylight-infra-deploy-maven-site.sh +++ b/jjb/opendaylight-infra-deploy-maven-site.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. diff --git a/jjb/ovsdb/cleanup-docker.sh b/jjb/ovsdb/cleanup-docker.sh index 9aff8ed0e..ec7bbd312 100644 --- a/jjb/ovsdb/cleanup-docker.sh +++ b/jjb/ovsdb/cleanup-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e diff --git a/jjb/ovsdb/include-setup-hwvtep-docker.sh b/jjb/ovsdb/include-setup-hwvtep-docker.sh index 7860c4b72..f8d310302 100644 --- a/jjb/ovsdb/include-setup-hwvtep-docker.sh +++ b/jjb/ovsdb/include-setup-hwvtep-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e diff --git a/jjb/ovsdb/setup-docker.sh b/jjb/ovsdb/setup-docker.sh index 23f457545..ceb8539a6 100644 --- a/jjb/ovsdb/setup-docker.sh +++ b/jjb/ovsdb/setup-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e diff --git a/jjb/releng-maven-mri-stage.sh b/jjb/releng-maven-mri-stage.sh index 9dfb7859e..e056a8bbe 100644 --- a/jjb/releng-maven-mri-stage.sh +++ b/jjb/releng-maven-mri-stage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "---> releng-maven-mri-stage.sh" # This script publishes artifacts to a staging repo in Nexus and exports the karaf bundle URL. diff --git a/packer/provision/null_data.sh b/packer/provision/null_data.sh index 3fa6a3c9f..dbaed3bff 100644 --- a/packer/provision/null_data.sh +++ b/packer/provision/null_data.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # vi: ts=4 sw=4 sts=4 et : # Nothing to do for Ubuntu specific provisioning diff --git a/packer/provision/rh-user_data.sh b/packer/provision/rh-user_data.sh index 6bddb2449..8ad9abf7b 100644 --- a/packer/provision/rh-user_data.sh +++ b/packer/provision/rh-user_data.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # vi: ts=4 sw=4 sts=4 et : /bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers; diff --git a/packer/provision/system_reseal.sh b/packer/provision/system_reseal.sh index f8bc7dc5f..311fcc421 100644 --- a/packer/provision/system_reseal.sh +++ b/packer/provision/system_reseal.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # vim: sw=2 ts=2 sts=2 et : diff --git a/packer/provision/system_reseal_local_env.sh b/packer/provision/system_reseal_local_env.sh index 041fffeff..4b4e51593 100644 --- a/packer/provision/system_reseal_local_env.sh +++ b/packer/provision/system_reseal_local_env.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh # Here add local env changes. diff --git a/scripts/delete-jobs.sh b/scripts/delete-jobs.sh index ef8c84fa4..7baf0a36d 100755 --- a/scripts/delete-jobs.sh +++ b/scripts/delete-jobs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Script to delete Jenkins jobs by searching a string. #