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

various: master → main updates

Browse source 
cockpit/ bots/ and cockpituous/ all use the 'main' branch now.
This commit is contained in:
Allison Karlitskaya 2021-07-05 09:56:03 +02:00 • committed by Martin Pitt
parent 37a64010bf
commit 37b2ee5056
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -1,7 +1,7 @@
container: container:
# official cockpit CI container, with cockpit related build and test dependencies # official cockpit CI container, with cockpit related build and test dependencies
# if you want to use your own, see the documentation about required packages: # if you want to use your own, see the documentation about required packages:
# https://github.com/cockpit-project/cockpit/blob/master/HACKING.md#getting-the-development-dependencies # https://github.com/cockpit-project/cockpit/blob/main/HACKING.md#getting-the-development-dependencies
image: quay.io/cockpit/tasks image: quay.io/cockpit/tasks
kvm: true kvm: true
# increase this if you have many tests that benefit from parallelism # increase this if you have many tests that benefit from parallelism

2
Makefile
View file

@ -136,7 +136,7 @@ check: $(NODE_MODULES_TEST) $(VM_IMAGE) test/common
TEST_AUDIT_NO_SELINUX=1 test/common/run-tests TEST_AUDIT_NO_SELINUX=1 test/common/run-tests
# checkout Cockpit's bots for standard test VM images and API to launch them # checkout Cockpit's bots for standard test VM images and API to launch them
# must be from master, as only that has current and existing images; but testvm.py API is stable # must be from main, as only that has current and existing images; but testvm.py API is stable
# support CI testing against a bots change # support CI testing against a bots change
bots: bots:
git clone --quiet --reference-if-able $${XDG_CACHE_HOME:-$$HOME/.cache}/cockpit-project/bots https://github.com/cockpit-project/bots.git git clone --quiet --reference-if-able $${XDG_CACHE_HOME:-$$HOME/.cache}/cockpit-project/bots https://github.com/cockpit-project/bots.git

8
README.md
View file

@ -67,7 +67,7 @@ Run `make check` to build an RPM, install it into a standard Cockpit test VM
it. This uses Cockpit's Chrome DevTools Protocol based browser tests, through a it. This uses Cockpit's Chrome DevTools Protocol based browser tests, through a
Python API abstraction. Note that this API is not guaranteed to be stable, so Python API abstraction. Note that this API is not guaranteed to be stable, so
if you run into failures and don't want to adjust tests, consider checking out if you run into failures and don't want to adjust tests, consider checking out
Cockpit's test/common from a tag instead of master (see the `test/common` Cockpit's test/common from a tag instead of main (see the `test/common`
target in `Makefile`). target in `Makefile`).
After the test VM is prepared, you can manually run the test without rebuilding After the test VM is prepared, you can manually run the test without rebuilding
@ -101,7 +101,7 @@ To run the tests in the exact same way for upstream pull requests and for
tests are wrapped in the [FMF metadata format](https://github.com/psss/fmf) tests are wrapped in the [FMF metadata format](https://github.com/psss/fmf)
for using with the [tmt test management tool](https://docs.fedoraproject.org/en-US/ci/tmt/). for using with the [tmt test management tool](https://docs.fedoraproject.org/en-US/ci/tmt/).
Note that Packit tests can *not* run their own virtual machine images, thus Note that Packit tests can *not* run their own virtual machine images, thus
they only run [@nondestructive tests](https://github.com/martinpitt/cockpit/blob/master/test/common/testlib.py). they only run [@nondestructive tests](https://github.com/martinpitt/cockpit/blob/main/test/common/testlib.py).
# Customizing # Customizing
@ -115,7 +115,7 @@ change:
# Automated release # Automated release
Once your cloned project is ready for a release, you should consider automating Once your cloned project is ready for a release, you should consider automating
that. [Cockpituous release](https://github.com/cockpit-project/cockpituous/tree/master/release) that. [Cockpituous release](https://github.com/cockpit-project/cockpituous/tree/main/release)
aims to fully automate project releases to GitHub, Fedora, Ubuntu, COPR, Docker aims to fully automate project releases to GitHub, Fedora, Ubuntu, COPR, Docker
Hub, and other places. The intention is that the only manual step for releasing Hub, and other places. The intention is that the only manual step for releasing
a project is to create a signed tag for the version number; pushing the tag a project is to create a signed tag for the version number; pushing the tag
@ -130,7 +130,7 @@ up secrets and run cockpituous.
It is important to keep your [NPM modules](./package.json) up to date, to keep It is important to keep your [NPM modules](./package.json) up to date, to keep
up with security updates and bug fixes. This is done with the up with security updates and bug fixes. This is done with the
[npm-update bot script](https://github.com/cockpit-project/bots/blob/master/npm-update) [npm-update bot script](https://github.com/cockpit-project/bots/blob/main/npm-update)
which is run weekly or upon [manual request](https://github.com/cockpit-project/starter-kit/actions) through the which is run weekly or upon [manual request](https://github.com/cockpit-project/starter-kit/actions) through the
[npm-update.yml](.github/workflows/npm-update.yml) [GitHub action](https://github.com/features/actions). [npm-update.yml](.github/workflows/npm-update.yml) [GitHub action](https://github.com/features/actions).

4
cockpituous-release
View file

@ -1,5 +1,5 @@
# This is a script run to release this project through Cockpituous: # This is a script run to release this project through Cockpituous:
# https://github.com/cockpit-project/cockpituous/tree/master/release # https://github.com/cockpit-project/cockpituous/tree/main/release
# Anything that start with 'job' may run in a way that it SIGSTOP's # Anything that start with 'job' may run in a way that it SIGSTOP's
# itself when preliminary preparition and then gets a SIGCONT in # itself when preliminary preparition and then gets a SIGCONT in
@ -23,7 +23,7 @@ job release-srpm -V
## Authenticate for pushing into Fedora dist-git ## Authenticate for pushing into Fedora dist-git
# cat ~/.fedora-password | kinit yourfedorauser@FEDORAPROJECT.ORG # cat ~/.fedora-password | kinit yourfedorauser@FEDORAPROJECT.ORG
## Do fedora builds for the tag, using tarball ## Do fedora builds for the tag, using tarball
# job release-koji -k master # job release-koji -k main
# job release-koji f33 # job release-koji f33
# job release-bodhi F33 # job release-bodhi F33

2
test/browser/browser.sh
View file

@ -39,7 +39,7 @@ if ! id runtest 2>/dev/null; then
useradd -c 'Test runner' runtest useradd -c 'Test runner' runtest
# allow test to set up things on the machine # allow test to set up things on the machine
mkdir -p /root/.ssh mkdir -p /root/.ssh
curl https://raw.githubusercontent.com/cockpit-project/bots/master/machine/identity.pub >> /root/.ssh/authorized_keys curl https://raw.githubusercontent.com/cockpit-project/bots/main/machine/identity.pub >> /root/.ssh/authorized_keys
chmod 600 /root/.ssh/authorized_keys chmod 600 /root/.ssh/authorized_keys
fi fi
chown -R runtest "$SOURCE" chown -R runtest "$SOURCE"

2
test/check-application
View file

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
# Run this with --help to see available options for tracing and debugging # Run this with --help to see available options for tracing and debugging
# See https://github.com/cockpit-project/cockpit/blob/master/test/common/testlib.py # See https://github.com/cockpit-project/cockpit/blob/main/test/common/testlib.py
# "class Browser" and "class MachineCase" for the available API. # "class Browser" and "class MachineCase" for the available API.
import os import os