From 8d0ffb2fa56d0d292836ac8c829e3dbeae8eeef4 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 10 May 2023 13:13:05 +0200 Subject: [PATCH] Remove unneeded targets from scripts Signed-off-by: Evan Lezar --- scripts/build-packages.sh | 17 +---------------- scripts/release-packages.sh | 17 ----------------- scripts/utils.sh | 12 ++++++++++++ 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 7d424838..c6fa086b 100755 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -23,22 +23,7 @@ set -e SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )" -# This list represents the distribution-architecture pairs that are actually published -# to the relevant repositories. This targets forwarded to the build-all-components script -# can be overridden by specifying command line arguments. -all=( - amazonlinux2-aarch64 - amazonlinux2-x86_64 - centos7-x86_64 - centos8-aarch64 - centos8-ppc64le - centos8-x86_64 - debian10-amd64 - opensuse-leap15.1-x86_64 - ubuntu18.04-amd64 - ubuntu18.04-arm64 - ubuntu18.04-ppc64le -) +source "${SCRIPTS_DIR}"/utils.sh if [[ $# -gt 0 ]]; then targets=($*) diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh index ccc73026..1d777d70 100755 --- a/scripts/release-packages.sh +++ b/scripts/release-packages.sh @@ -153,23 +153,6 @@ function sync() { fi } -# This list represents the distribution-architecture pairs that are actually published -# to the relevant repositories. This targets forwarded to the build-all-components script -# can be overridden by specifying command line arguments. -all=( - amazonlinux2-aarch64 - amazonlinux2-x86_64 - centos7-x86_64 - centos8-aarch64 - centos8-ppc64le - centos8-x86_64 - debian10-amd64 - opensuse-leap15.1-x86_64 - ubuntu18.04-amd64 - ubuntu18.04-arm64 - ubuntu18.04-ppc64le -) - targets=${all[@]} _current_branch=$(git -C ${PACKAGE_REPO_ROOT} rev-parse --abbrev-ref HEAD) diff --git a/scripts/utils.sh b/scripts/utils.sh index 70887d31..7c830eee 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -12,6 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +# This list represents the distribution-architecture pairs that are actually published +# to the relevant repositories. This targets forwarded to the build-all-components script +# can be overridden by specifying command line arguments. +all=( + centos7-x86_64 + centos8-aarch64 + centos8-ppc64le + centos8-x86_64 + ubuntu18.04-amd64 + ubuntu18.04-arm64 + ubuntu18.04-ppc64le +) # package_type returns the packaging type (deb or rpm) for the specfied distribution. # An error is returned if the ditribution is unsupported.