Merge pull request #69 from hashicorp/releng/redhat-fix

Releng/redhat fix
hashicorp · Nov 27, 2023 · f6278ea · f6278ea
2 parents c9f50f7 + e80d8df
commit f6278ea
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/scripts/digest_inputs b/scripts/digest_inputs
@@ -20,7 +20,6 @@ source "${BASH_SOURCE%/*}/validation.bash"
 [ -n "${ARCH:-}"       ] || die "Must set ARCH"
 [ -n "${TARGET:-}"     ] || die "Must set TARGET"
 [ -n "${TAGS:-}${REDHAT_TAG:-}" ] || die "Must set either TAGS or REDHAT_TAG"
-[ -z "${TAGS:-}" ] || [ -z "${REDHAT_TAG:-}" ] || die "Must set either TAGS or REDHAT_TAG (not both)"
 
 # Optional env vars.
 ARM_VERSION="${ARM_VERSION:-}"

diff --git a/scripts/digest_inputs.bats b/scripts/digest_inputs.bats
@@ -285,13 +285,6 @@ assert_failure_with_message_when() { local MESSAGE="$1"; shift
 
 }
 
-@test "redhat_tag and tags set / error" {
-	set_all_required_env_vars_and_tags
-	export REDHAT_TAG="blah"
-	WANT_ERR="Must set either TAGS or REDHAT_TAG (not both)"
-	assert_failure_with_message_when "$WANT_ERR" ./digest_inputs
-}
-
 @test "redhat_tags contains an old redhat tag / error" {
 	set_all_required_env_vars_and_tags
 	TAGS=""

diff --git a/scripts/docker_build b/scripts/docker_build
@@ -16,7 +16,6 @@ die() { echo "$1" 1>&2; exit 1; }
 [ -n "${PLATFORM:-}" ] || die "Must set PLATFORM"
 [ -n "${AUTO_TAG:-}" ] || die "Must set AUTO_TAG"
 [ -n "${TAGS:-}${REDHAT_TAG:-}" ] || die "Must set either TAG or REDHAT_TAG"
-[ -z "${TAGS:-}" ] || [ -z "${REDHAT_TAG:-}" ] || die "Must set either TAG or REDHAT_TAG (not both)"
 
 
 WORKDIR="${WORKDIR:-.}"