Techognito/starter-kit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: Use test/common Cockpit API from latest stable tag

Browse source 
Cockpit's testlib.py has no stable API guarantee, so check it out from a
stable tag instead of master. This should occasionally be bumped to stay
current.

Note that the same does not apply to bots/: Stable tags are useless
there as the old images get cleaned up. Also, testvm.py API needs to be
stable for Cockpit's own purposes already.

This needs to drop the slight git checkout optimization, but this also
makes the code more symmetric and easier to understand.
This commit is contained in:
Martin Pitt 2018-03-10 10:19:07 +01:00
parent 8e9cc58eef
commit 8f0f125796
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -60,15 +60,16 @@ check: node_modules/react-lite $(VM_IMAGE) test/common
TEST_AUDIT_NO_SELINUX=1 test/check-starter-kit TEST_AUDIT_NO_SELINUX=1 test/check-starter-kit
# checkout Cockpit's bots/ directory for standard test VM images and API to launch them # checkout Cockpit's bots/ directory for standard test VM images and API to launch them
# must be from cockpit's master, as only that has current and existing images; but testvm.py API is stable
bots: bots:
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git git fetch --depth=1 https://github.com/cockpit-project/cockpit.git
git checkout --force FETCH_HEAD -- bots/ git checkout --force FETCH_HEAD -- bots/
git reset bots git reset bots
# checkout Cockpit's test API # checkout Cockpit's test API; this has no API stability guarantee, so check out a stable tag
# when you start a new project, use the latest relese, and update it from time to time
test/common: test/common:
# when running in CI, update FETCH_HEAD to cockpit repo git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 163
if git remote | grep -qF test; then git fetch origin master; fi
git checkout --force FETCH_HEAD -- test/common git checkout --force FETCH_HEAD -- test/common
git reset test/common git reset test/common