Merge pull request #2023 from evgenyz/fix-release-scripts

evgenyz · web-flow · commit 49538c272475 · 2023-09-06T15:24:01.000+02:00
Remove sendmail from prerequisites of release_tools
diff --git a/release_tools/release.sh b/release_tools/release.sh
@@ -61,11 +61,6 @@ trigger_docbuild()
 }
 
 
-ensure_test_prerequisities()
-{
-    systemctl -q is-active sendmail || die "As of 11/2017, you have to have 'sendmail' running for tests to succeed."
-}
-
 build_all()
 {
     (mkdir -p "$BUILDDIR" && cd "$BUILDDIR" && cmake -DENABLE_SCE=TRUE .. && make) || die "Error building pristine OpenSCAP"
@@ -74,7 +69,6 @@ build_all()
 
 execute_local_tests()
 {
-    ensure_test_prerequisities
     build_all
     (cd "$BUILDDIR" && ctest || die "Error during test run")
     check_python_binding 3

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,6 @@ trigger_docbuild()`
`61`	`61`	`}`
`62`	`62`
`63`	`63`
`64`		`-ensure_test_prerequisities()`
`65`		`-{`
`66`		`- systemctl -q is-active sendmail \|\| die "As of 11/2017, you have to have 'sendmail' running for tests to succeed."`
`67`		`-}`
`68`		`-`
`69`	`64`	`build_all()`
`70`	`65`	`{`
`71`	`66`	`(mkdir -p "$BUILDDIR" && cd "$BUILDDIR" && cmake -DENABLE_SCE=TRUE .. && make) \|\| die "Error building pristine OpenSCAP"`
`@@ -74,7 +69,6 @@ build_all()`
`74`	`69`
`75`	`70`	`execute_local_tests()`
`76`	`71`	`{`
`77`		`- ensure_test_prerequisities`
`78`	`72`	`build_all`
`79`	`73`	`(cd "$BUILDDIR" && ctest \|\| die "Error during test run")`
`80`	`74`	`check_python_binding 3`