From 41bdb345e9218579f91840705c0aecff0fce4942 Mon Sep 17 00:00:00 2001 From: Packit Date: May 24 2022 13:04:27 +0000 Subject: [packit] 270 upstream release Upstream tag: 270 Upstream commit: 8f48c474 Signed-off-by: Packit --- diff --git a/.gitignore b/.gitignore index 0cacdaf..910a27c 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ /cockpit-268.tar.xz /cockpit-268.1.tar.xz /cockpit-269.tar.xz +/cockpit-270.tar.xz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..dfd4569 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.51.1.dev6+g1099056. diff --git a/cockpit.spec b/cockpit.spec index ec25fbf..9701f58 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,6 +1,3 @@ -# This spec file has been automatically updated -Version: 269 -Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. # @@ -52,14 +49,16 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Source0: https://github.com/cockpit-project/cockpit/releases/download/269/cockpit-269.tar.xz +Version: 270 +Release: 1%{?dist} +Source0: https://github.com/cockpit-project/cockpit/releases/download/270/cockpit-270.tar.xz # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR. # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream # We also provide an override mechanism if you want to build all packages. -%define build_all 0 +%define build_all 1 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all} %if "%{name}" == "cockpit" @@ -679,6 +678,13 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Tue May 24 2022 Packit - 270-1 +- Allow removal of user created timers +- Working with diagnostic reports has been improved +- metrics: Add CPU temperature to metrics page +- bridge: Add channel redirection + + * Thu May 12 2022 Cockpit Project - 269-1 - Update to upstream 269 release diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..ccc1da9 --- /dev/null +++ b/packit.yaml @@ -0,0 +1,98 @@ +upstream_project_url: https://github.com/cockpit-project/cockpit +actions: + post-upstream-clone: + # HACK: packit's "fix spec file" stage does not kick in here, and it does not take the spec from the tarball + # https://github.com/packit/packit-service/issues/1515 + - sh -exc 'tools/create-spec --version $(git describe | tr - .) --build-all -o cockpit.spec tools/cockpit.spec.in' + # HACK: until FMF uses tests from dist-git source tarball: https://github.com/teemtee/tmt/issues/585 + - sh -exc 'mkdir -p tmp; curl --silent --fail https://src.fedoraproject.org/rpms/cockpit/raw/rawhide/f/plans/upstream.fmf | sed -r "/ref:/ s/[0-9.]+/$(git describe --abbrev=0)/" > tmp/upstream.fmf' + + create-archive: + # The sandcastle doesn't have enough ram to run webpack, so wait + # until the webpack-jumpstart workflow has run and grab the result. + - tools/webpack-jumpstart --wait --rebase + - tools/make-dist + +# HACK: packit.yml and spec get synced by default; drop this when the plans/upstream.fmf HACK above gets dropped +files_to_sync: + - packit.yaml + - cockpit.spec + - src: tmp/upstream.fmf + dest: plans/upstream.fmf + +srpm_build_deps: + - automake + - gcc + - glib2-devel + - make + - systemd-devel +# use the nicely formatted release NEWS from our upstream release, instead of git shortlog +copy_upstream_release_description: true +jobs: + - job: tests + trigger: pull_request + metadata: + targets: + - fedora-35 + - fedora-36 + - fedora-development + - centos-stream-8-x86_64 + - centos-stream-9-x86_64 + + # run build/unit tests on some interesting architectures + - job: copr_build + trigger: pull_request + metadata: + targets: + # 32 bit + - fedora-development-i386 + # big-endian + - fedora-development-s390x + + - job: copr_build + trigger: release + metadata: + owner: "@cockpit" + project: "cockpit-preview" + preserve_project: True + targets: + - fedora-35 + - fedora-36 + - fedora-development + - centos-stream-8-x86_64 + - centos-stream-9-x86_64 + actions: + post-upstream-clone: + # HACK: https://github.com/packit/packit/issues/1560 + - tools/node-modules checkout + # packit will overwrite the version in its "fix spec file" stage + - tools/create-spec --version 0 --build-all -o cockpit.spec tools/cockpit.spec.in + # HACK: tarball for releases (copr_build, koji, etc.), copying spec's Source0; this + # really should be the default, see https://github.com/packit/packit-service/issues/1505 + create-archive: + - sh -exc "curl -L -O https://github.com/cockpit-project/cockpit/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + - sh -exc "ls ${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + + - job: propose_downstream + trigger: release + metadata: + dist_git_branches: + - fedora-development + - fedora-35 + - fedora-36 + + - job: koji_build + trigger: commit + metadata: + dist_git_branches: + - fedora-development + - fedora-35 + - fedora-36 + + - job: bodhi_update + trigger: commit + metadata: + dist_git_branches: + # rawhide updates are created automatically + - fedora-35 + - fedora-36 diff --git a/plans/upstream.fmf b/plans/upstream.fmf index f253b9f..32409f9 100644 --- a/plans/upstream.fmf +++ b/plans/upstream.fmf @@ -2,6 +2,6 @@ discover: how: fmf repository: https://github.com/cockpit-project/cockpit # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585 - ref: "269" + ref: "270" execute: how: tmt diff --git a/sources b/sources index 9977590..a1b7af1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-269.tar.xz) = bc43d7fdb970a2b61941a924ac4aa3a03bb2268494ec11fc2c61341e83b5907f58c1d85f20c86c35d1bb407e8daac8aa3609718305ee2abad5f42995414596f1 +SHA512 (cockpit-270.tar.xz) = 364053ef84f53c0f83298dbd414375ef244855859b29b03b132e9cd874977fbc14ebd3eda328ddb47562cd38d8d212421241b3b9e642a6b868d16b141c7b08a6