#27 Sync the CI tests with the rawhide branch
Merged a year ago by nickc. Opened a year ago by vkadlcik.
Unknown source f36  into  f36

file modified
+1 -2
@@ -1,6 +1,5 @@

  summary: CI Gating Plan

  discover:

      how: fmf

-     directory: tests

  execute:

-     how: beakerlib

+     how: tmt

@@ -8,9 +8,11 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

+ require:

  - annobin-annocheck

+ - annobin-plugin-gcc

  - gcc

+ - redhat-rpm-config

  duration: 48h

  extra-summary: /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check

  extra-task: /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check

@@ -28,13 +28,10 @@

  # Include Beaker environment

  . /usr/share/beakerlib/beakerlib.sh || exit 1

  

- PACKAGE="annobin"

- 

  rlJournalStart

      rlPhaseStartSetup

          rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"

          rlRun "pushd $TmpDir"

-         rlRun  "rpm -q annobin-annocheck gcc"

      rlPhaseEnd

  

      rlPhaseStartTest
@@ -43,7 +40,7 @@

          rlRun "gcc `rpm --eval %build_cflags` -fpic -c f1.c"

          rlRun "gcc `rpm --eval %build_cflags` -fpic -c f2.c"

          rlRun "gcc `rpm --eval %build_ldflags` -shared f1.o f2.o"

-         rlRun "annocheck -v a.out"

+         rlRun "annocheck -v --skip-lto a.out"

      rlPhaseEnd

  

      rlPhaseStartCleanup

@@ -7,15 +7,8 @@

  test: ./runtest.sh

  framework: beakerlib

  recommend:

- - annobin

- - devtoolset-10

- - devtoolset-10-annocheck

- - devtoolset-11

- - devtoolset-11-annocheck

- - gcc-toolset-10

- - gcc-toolset-10-annocheck

- - gcc-toolset-11

- - gcc-toolset-11-annocheck

+ - annobin-plugin-gcc

+ - annobin-annocheck

  duration: 48h

  extra-summary: /tools/annobin/Regression/identify

  extra-task: /tools/annobin/Regression/identify

@@ -6,11 +6,12 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

- - gcc

- - annobin

+ require:

+ - annobin-plugin-gcc

  - annobin-annocheck

  - redhat-rpm-config

+ - gcc

+ - redhat-rpm-config

  duration: 48h

  extra-summary: /tools/annobin/Regression/lto-preprocessor-options

  extra-task: /tools/annobin/Regression/lto-preprocessor-options

@@ -7,8 +7,8 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

- - annobin

+ require:

+ - annobin-annocheck

  duration: 48h

  link:

  -   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1991931

@@ -7,8 +7,8 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

- - annobin

+ require:

+ - annobin-annocheck

  duration: 48h

  link:

  -   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1988714

@@ -7,8 +7,9 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

- - annobin

+ require:

+ - annobin-plugin-gcc

+ - annobin-annocheck

  - libstdc++

  duration: 48h

  link:

@@ -6,23 +6,19 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

- - annobin

+ require:

+ - annobin-plugin-gcc

  - annobin-annocheck

  - binutils-devel

- - gcc

- - gcc-c++

+ - bzip2-devel

+ - dnf

  - elfutils

  - elfutils-devel

+ - gcc-c++

+ - gcc-plugin-devel

  - make

  - rpm-build

  - rpm-devel

- - gcc-plugin-devel

- - yum

- - dnf

- - yum-utils

- - bzip2-devel

- - rpm-build

  duration: 48h

  extra-summary: /tools/annobin/Regression/testsuite

  extra-task: /tools/annobin/Regression/testsuite

@@ -62,7 +62,7 @@

          rlRun "pushd $TMP"

  

  	rlFetchSrcForInstalled $PACKAGE

- 	rlRun "yum-builddep -y *src.rpm"

+ 	rlRun "dnf builddep -y *src.rpm"

  	rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm"

  	rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/annobin.spec"

      rlPhaseEnd

@@ -7,8 +7,9 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

- - annobin

+ require:

+ - annobin-plugin-gcc

+ - annobin-annocheck

  duration: 48h

  link:

  -   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973981

@@ -28,8 +28,6 @@

  # Include Beaker environment

  . /usr/share/beakerlib/beakerlib.sh || exit 1

  

- PACKAGE="annobin"

- 

  rlJournalStart

      rlPhaseStartSetup

          rlRun "TMP=$(mktemp -d)"
@@ -41,7 +39,10 @@

          samplecnt=$(ls *.sample | wc -l)

          testcnt=$(ls *.sample | \

                    xargs annocheck |& \

-                   fgrep '.sample: is not an ELF format file' | wc -l)

+                   grep -F \

+                       -e '.sample: unable to read magic number' \

+                       -e '.sample: is not an ELF format file' \

+                   | wc -l)

          rlRun "test $samplecnt -eq 300"

          rlRun "test $testcnt -eq 300"

      rlPhaseEnd

file modified
+3 -3
@@ -6,11 +6,11 @@

  - annobin

  test: ./runtest.sh

  framework: beakerlib

- recommend:

+ require:

+ - annobin-plugin-gcc

+ - annobin-annocheck

  - man-db

  - gcc

- - annobin

- - annobin-annocheck

  duration: 48h

  extra-summary: /tools/annobin/Sanity/smoke

  extra-task: /tools/annobin/Sanity/smoke

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/73a945c670864eee9ad784c13c063b72

Pull-Request has been merged by nickc

a year ago