Cleanup tagging and gating scripts to appease shellcheck:
* scripts/builds/build_vanilla.sh: Use an array to handle the varying arguments to rhpkg. * scripts/builds/check_signatures.sh: Quote variable usage. * scripts/builds/waive_issue.sh: Remove redundant 'test "x"' usage. * scripts/builds/waive_leapp_issue.sh: Likewise. * scripts/builds/waive_rpminspect.sh: Likewise. * scripts/builds/waive_usual_rpminspect.sh: Likewise and add missing WORKING_DIR variable. * scripts/builds/waive_usual_tier0.sh: Remove redundant 'test "x"' usage. Related: RHEL-155327 Related: RHEL-155339
This commit is contained in:
Andrew Hughes
parent
f2aac50928
commit
bc0c9a72cb
@ -349,7 +349,7 @@
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 9
|
||||
%global rpmrelease 1
|
||||
%global rpmrelease 2
|
||||
# Settings used by the portable build
|
||||
%global portablerelease 1
|
||||
# Portable suffix differs between RHEL and CentOS
|
||||
@ -2602,6 +2602,18 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 14 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-2
|
||||
- Cleanup tagging and gating scripts to appease shellcheck:
|
||||
- * scripts/builds/build_vanilla.sh: Use an array to handle the varying arguments to rhpkg.
|
||||
- * scripts/builds/check_signatures.sh: Quote variable usage.
|
||||
- * scripts/builds/waive_issue.sh: Remove redundant 'test "x"' usage.
|
||||
- * scripts/builds/waive_leapp_issue.sh: Likewise.
|
||||
- * scripts/builds/waive_rpminspect.sh: Likewise.
|
||||
- * scripts/builds/waive_usual_rpminspect.sh: Likewise and add missing WORKING_DIR variable.
|
||||
- * scripts/builds/waive_usual_tier0.sh: Remove redundant 'test "x"' usage.
|
||||
- Related: RHEL-155327
|
||||
- Related: RHEL-155339
|
||||
|
||||
* Sat Apr 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-1
|
||||
- Update to jdk-25.0.3+9 (GA)
|
||||
- Update release notes to 25.0.3+9
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2024 Red Hat, Inc.
|
||||
# Copyright (C) 2026 Red Hat, Inc.
|
||||
# Written by:
|
||||
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||
#
|
||||
@ -20,20 +20,24 @@
|
||||
# Builds a scratch build of vanilla OpenJDK with no local patches
|
||||
|
||||
SEPARATE_ARCHES=${1}
|
||||
CMD="--target java-openjdk-rhel-8-build --skip-nvr-check --nowait";
|
||||
CMD=(rhpkg -v build --target java-openjdk-rhel-8-build --skip-nvr-check --nowait);
|
||||
SUPPORTED_ARCHES="aarch64 ppc64le s390x x86_64";
|
||||
|
||||
if [ "x${SEPARATE_ARCHES}" = "x" ] ; then
|
||||
if [ "${SEPARATE_ARCHES}" = "" ] ; then
|
||||
SEPARATE_ARCHES=0;
|
||||
fi
|
||||
|
||||
if [ ${SEPARATE_ARCHES} -eq 1 ] ; then
|
||||
for arch in ${SUPPORTED_ARCHES}; do \
|
||||
rhpkg -v build --arches ${arch} --scratch ${CMD} ; \
|
||||
done && brew watch-task --mine
|
||||
if [ "${SEPARATE_ARCHES}" -eq 1 ] ; then
|
||||
for arch in ${SUPPORTED_ARCHES}; do \
|
||||
ARCH_CMD=("${CMD[@]}" --arches "${arch}" --scratch) ;
|
||||
echo "Executing ${ARCH_CMD[*]}";
|
||||
command "${ARCH_CMD[@]}";
|
||||
done
|
||||
else
|
||||
rhpkg -v build ${CMD} && brew watch-task --mine
|
||||
echo "Executing ${CMD[*]}";
|
||||
command "${CMD[@]}";
|
||||
fi
|
||||
brew watch-task --mine
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck build_vanilla.sh"
|
||||
|
||||
@ -43,16 +43,16 @@ if ! test -e "${BUILDINFO}" ; then
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if cat ${BUILDINFO} | grep -q Signatures ; then
|
||||
signature=$(cat ${BUILDINFO} | grep Signatures|cut -d ' ' -f 2-|uniq -c);
|
||||
uniq_count=$(echo ${signature} | wc -l);
|
||||
if test ${uniq_count} -gt 1; then
|
||||
if grep -q "Signatures" < "${BUILDINFO}" ; then
|
||||
signature=$(grep "Signatures" < "${BUILDINFO}" | cut -d ' ' -f 2- | uniq -c | sed 's#^\W*##');
|
||||
uniq_count=$(echo "${signature}" | wc -l);
|
||||
if test "${uniq_count}" -gt 1; then
|
||||
echo "Multiple signature types found:";
|
||||
echo "${signature}";
|
||||
exit 4;
|
||||
fi
|
||||
sig_count=$(echo ${signature} | cut -d ' ' -f 1);
|
||||
sig_type=$(echo ${signature} | cut -d ' ' -f 2);
|
||||
sig_count=$(echo "${signature}" | cut -d ' ' -f 1);
|
||||
sig_type=$(echo "${signature}" | cut -d ' ' -f 2);
|
||||
echo "${sig_count} signatures of type ${sig_type} found";
|
||||
if echo "${sig_type}" | grep -q "${NEW_SIGNATURE}" ; then
|
||||
echo "PQC signature found.";
|
||||
|
||||
@ -42,25 +42,25 @@ else
|
||||
SKIP_JSON=0;
|
||||
fi
|
||||
|
||||
if test "x${RHEL_VER}" = "x"; then
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x${NVR}" = "x"; then
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
if test "x${TESTCASE}" = "x"; then
|
||||
if test "${TESTCASE}" = ""; then
|
||||
echo "No testcase specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <TESTCASE> <COMMENT>";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
if test "x${COMMENT}" = "x"; then
|
||||
if test "${COMMENT}" = ""; then
|
||||
COMMENT="Gating broken";
|
||||
echo "Setting COMMENT to default of '${COMMENT}'"
|
||||
fi
|
||||
|
||||
@ -24,13 +24,13 @@ NVR=${2}
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
if test "x${RHEL_VER}" = "x"; then
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x${NVR}" = "x"; then
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
|
||||
@ -25,13 +25,13 @@ COMMENT=${3}
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
if test "x${RHEL_VER}" = "x"; then
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <COMMENT>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x${NVR}" = "x"; then
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR> <COMMENT>";
|
||||
exit 2;
|
||||
|
||||
@ -20,16 +20,18 @@
|
||||
# Waive the recurring rpminspect gating issues
|
||||
# Should be resolved by RHELPLAN-102267
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
RHEL_VER=${1}
|
||||
NVR=${2}
|
||||
|
||||
if test "x${RHEL_VER}" = "x"; then
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x${NVR}" = "x"; then
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
|
||||
@ -25,13 +25,13 @@ NVR=${2}
|
||||
|
||||
WORKING_DIR=$(dirname "${0}")
|
||||
|
||||
if test "x${RHEL_VER}" = "x"; then
|
||||
if test "${RHEL_VER}" = ""; then
|
||||
echo "No RHEL version specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x${NVR}" = "x"; then
|
||||
if test "${NVR}" = ""; then
|
||||
echo "No NVR specified.";
|
||||
echo "${0} <RHEL_VER> <NVR>";
|
||||
exit 2;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user