sync with f26

This commit is contained in:
Peter Robinson 2017-10-01 14:56:18 +01:00
parent 0be74aea08
commit 179639ce82
3 changed files with 8 additions and 1 deletions

View File

@ -1,6 +1,6 @@
# This spec file has been automatically updated # This spec file has been automatically updated
Version: 151 Version: 151
Release: 1%{?dist} Release: 2%{?dist}
# #
# This file is maintained at the following location: # This file is maintained at the following location:
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
@ -659,6 +659,9 @@ The Cockpit component for installing package updates, via PackageKit.
# The changelog is automatically generated and merged # The changelog is automatically generated and merged
%changelog %changelog
* Mon Sep 25 2017 Stef Walter <stefw@redhat.com> - 151-2
- Add simulated test failure
* Thu Sep 21 2017 Martin Pitt <martin@piware.de> - 151-1 * Thu Sep 21 2017 Martin Pitt <martin@piware.de> - 151-1
- Support loading SSH keys from arbitrary paths - Support loading SSH keys from arbitrary paths

3
tests/test-canary Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh -e
echo "This is a test failure to see if CI is working"
exit 1

View File

@ -18,3 +18,4 @@
- classic - classic
tests: tests:
- ./source/tools/debian/tests/smoke - ./source/tools/debian/tests/smoke
- ./test-canary