From ed19e9f77c925d2a9c05dc8a91a7c6d346b5d161 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Aug 25 2020 11:10:27 +0000 Subject: Sanity/oscap-builds-ssg: update to reflect the latest state --- diff --git a/Sanity/oscap-builds-ssg/Makefile b/Sanity/oscap-builds-ssg/Makefile index 367ac0e..010b02f 100644 --- a/Sanity/oscap-builds-ssg/Makefile +++ b/Sanity/oscap-builds-ssg/Makefile @@ -53,11 +53,11 @@ $(METADATA): Makefile @echo "Type: Sanity" >> $(METADATA) @echo "TestTime: 40m" >> $(METADATA) @echo "RunFor: openscap" >> $(METADATA) - @echo "Requires: openscap" >> $(METADATA) + @echo "Requires: openscap cmake make openscap-utils python3-pyyaml python3-jinja2" >> $(METADATA) @echo "Priority: Normal" >> $(METADATA) @echo "License: GPLv2+" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) + @echo "Releases: Fedora" >> $(METADATA) rhts-lint $(METADATA) diff --git a/Sanity/oscap-builds-ssg/runtest.sh b/Sanity/oscap-builds-ssg/runtest.sh index 57a86c8..0bdbde0 100755 --- a/Sanity/oscap-builds-ssg/runtest.sh +++ b/Sanity/oscap-builds-ssg/runtest.sh @@ -31,14 +31,15 @@ PACKAGE="openscap-utils" -ssgname="scap-security-guide" -ssgtag="v0.1.38" +ssgname="content" rlJournalStart rlPhaseStartSetup rlAssertRpm $PACKAGE - rlRun "git clone https://github.com/OpenSCAP/$ssgname.git" 0 "Cloning SSG source" - rlRun "pushd $ssgname" 0 + rlRun "git clone https://github.com/ComplianceAsCode/${ssgname}" 0 "Cloning SSG source" + rlRun "pushd $ssgname" + # Get tag of the latest release. + ssgtag=$(git tag -l | grep "v0\.1\.[0-9]\+" | sort | tail -n1) rlRun "git checkout $ssgtag" 0 "Check out to the latest released version." rlRun "mkdir -p build" 0 "Ensuring that build dir exists" rlRun "pushd build" @@ -46,7 +47,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "make test" 0 "Checking that the freshly built SSG is OK" + rlRun "ctest --output-on-failure" 0 "Checking that the freshly built SSG is OK" rlPhaseEnd rlPhaseStartCleanup