From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1881
Currently the tests fail without any reasonable information on how to run
the tests manually. We can add better messaging, for example,
This redhat/self-test test has failed. You can run all tests by
executing 'make dist-self-test', or just this test by executing 'bats
redhat/self-test/0001-shellcheck.bats'.
Additionally clean up the tests to provide a proper header for each bats
test as well as a purpose for each test, and reformat the tests to use the
standard kernel practice of using tabs vs spaces.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/self-test/0001-shellcheck.bats | 15 +-
redhat/self-test/1001-rpmlint.bats | 30 ++--
redhat/self-test/1002-basic-structural-test.bats | 123 +++++++++++-----------
redhat/self-test/1003-rpminspect.bats | 29 ++--
redhat/self-test/1005-dist-dump-variables.bats | 8 +-
redhat/self-test/1006-verify-SPEC-variables.bats | 12 +-
redhat/self-test/2001-dist-release.bats | 116 ++++++++++++---------
redhat/self-test/3001-Makefile-contents.bats | 28 +++-
redhat/self-test/test-lib.bash | 16 ++
9 files changed, 224 insertions(+), 153 deletions(-)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1878
One of the self-tests, 1005-dist-dump-variables.bats, runs a comparison
against a known good specfile and compares it to a spec file generated
against the latest tree. This test currently compares the entire
specfile. As a consequence if anyone changes anything in the specfile the
test data needs to be regenerated, even if the change does not involve
modifications of the Makefile variables.
Modify the output to only look at the results of the Makefile variables
that are passed into the specfile, and update the redhat/self-test
dataset.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 3037 -------------------
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 3037 -------------------
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 3036 ------------------
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 3036 ------------------
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 3037 -------------------
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 3037 -------------------
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 3036 ------------------
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 3036 ------------------
redhat/self-test/data/create-data.sh | 2 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 3037 -------------------
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 3037 -------------------
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 3036 ------------------
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 3036 ------------------
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 3037 -------------------
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 3037 -------------------
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 3036 ------------------
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 3036 ------------------
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 3037 -------------------
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 3037 -------------------
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 3036 ------------------
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 3036 ------------------
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 3037 -------------------
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 3037 -------------------
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 3036 ------------------
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 3036 ------------------
25 files changed, 1 insertions(+), 72877 deletions(-)
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1815
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: SFC_SIENA [=n]
Type : tristate
Defined at drivers/net/ethernet/sfc/siena/Kconfig:2
Prompt: Solarflare SFC9000 support
Depends on: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_SOLARFLARE [=y]
&& PCI [=y] && PTP_1588_CLOCK [=y]
Location:
Main menu
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> Ethernet driver support (ETHERNET [=y])
-> Solarflare devices (NET_VENDOR_SOLARFLARE [=y])
Selects: MDIO [=m] && CRC32 [=y]
---
Cc: "Íñigo Huguet" <ihuguet(a)redhat.com>
Cc: Jarod Wilson <jarod(a)redhat.com>
Cc: Michal Schmidt <mschmidt(a)redhat.com>
Cc: Petr Oros <poros(a)redhat.com>
Cc: Ken Cox <jkc(a)redhat.com>
Cc: "José Ignacio Tornos Martínez" <jtornosm(a)redhat.com>
Cc: Kamal Heib <kheib(a)redhat.com>
Cc: Stefan Assmann <sassmann(a)redhat.com>
Cc: Corinna Vinschen <vinschen(a)redhat.com>
Cc: Ivan Vecera <ivecera(a)redhat.com>
Cc: Jonathan Toppins <jtoppins(a)redhat.com>
Cc: Josef Oskera <joskera(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/ark/generic/CONFIG_SFC_SIENA | 1 +
redhat/configs/pending-ark/generic/CONFIG_SFC_SIENA | 16 ----------------
2 files changed, 1 insertions(+), 16 deletions(-)
From: Don Zickus <dzickus(a)redhat.com>
Enable CKI on os-build MRs only
Not all the old Fedora branches have the latest Makefile and specfile
changes to support the self-test check. Disable the Fedora branches for
now.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,8 @@ workflow:
skip_publish: 'true'
skip_test: 'true'
skip_results: 'true'
+ rules:
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build"'
.9-common:
variables:
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1877