Sanity/oscap-builds-ssg: update to reflect the latest state

This commit is contained in:
Matus Marhefka 2020-08-25 13:10:27 +02:00
commit ed19e9f77c
2 changed files with 8 additions and 7 deletions

View file

@ -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)

View file

@ -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