Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stress-ng from the PPA (infra) #1425

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 5 additions & 24 deletions checkbox-core-snap/series16/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ slots:
package-repositories:
- type: apt
ppa: checkbox-dev/stable
- type: apt
ppa: colin-king/stress-ng

parts:
version-calculator:
Expand Down Expand Up @@ -94,33 +96,12 @@ parts:
- libbsd-dev
after: [version-calculator]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
stress-ng:
source-tag: "V0.15.07"
# stress-ng remains at version 0.15.07 because libipsec-mb-dev and libxxhash-dev are not available for Ubuntu 16.04 (Xenial).
source-depth: 1
plugin: make
build-environment:
- CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
- LDFLAGS: "-Wl,-z,relro -lrt"
source: https://github.com/ColinIanKing/stress-ng.git
make-parameters:
- STATIC=1 VERBOSE=1
plugin: nil
stage-packages:
- libjudydebian1
- libsctp1
- stress-ng
build-packages:
- gcc
- make
- zlib1g-dev
- libbsd-dev
- libgcrypt20-dev
- libkeyutils-dev
- libapparmor-dev
- libaio-dev
- libcap-dev
- libsctp-dev
- libjudy-dev
- stress-ng
after: [fwts]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
Expand Down
37 changes: 5 additions & 32 deletions checkbox-core-snap/series18/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ slots:
package-repositories:
- type: apt
ppa: checkbox-dev/stable
- type: apt
ppa: colin-king/stress-ng

parts:
version-calculator:
Expand Down Expand Up @@ -98,41 +100,12 @@ parts:
- libbsd-dev
after: [version-calculator]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
stress-ng:
source-tag: "V0.15.09"
source-depth: 1
plugin: make
build-environment:
- CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
- LDFLAGS: "-Wl,-z,relro -lrt"
source: https://github.com/ColinIanKing/stress-ng.git
make-parameters:
- STATIC=1 VERBOSE=1
plugin: nil
stage-packages:
- libjpeg-turbo8
- libjudydebian1
- libsctp1
- libxxhash0
- stress-ng
build-packages:
- gcc
- make
- zlib1g-dev
- libbsd-dev
- libgcrypt20-dev
- libkeyutils-dev
- libapparmor-dev
- libaio-dev
- libcap-dev
- libsctp-dev
- libatomic1
- libjudy-dev
- libjpeg-dev
- libkmod-dev
- libattr1-dev
- libxxhash-dev
- libmd-dev
- on amd64: [ libipsec-mb-dev ]
- stress-ng
after: [fwts]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
Expand Down
34 changes: 6 additions & 28 deletions checkbox-core-snap/series20/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ slots:
package-repositories:
- type: apt
ppa: checkbox-dev/stable
- type: apt
ppa: colin-king/stress-ng

parts:
version-calculator:
Expand Down Expand Up @@ -100,36 +102,12 @@ parts:
- libbsd-dev
after: [version-calculator]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
stress-ng:
source-tag: "V0.15.09"
source-depth: 1
plugin: make
build-environment:
- CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
- LDFLAGS: "-Wl,-z,relro -lrt"
source: https://github.com/ColinIanKing/stress-ng.git
make-parameters:
- STATIC=1 VERBOSE=1
plugin: nil
stage-packages:
- stress-ng
build-packages:
- gcc
- make
- zlib1g-dev
- libbsd-dev
- libgcrypt20-dev
- libkeyutils-dev
- libapparmor-dev
- libaio-dev
- libcap-dev
- libsctp-dev
- libatomic1
- libjudy-dev
- libjpeg-dev
- libkmod-dev
- libattr1-dev
- libxxhash-dev
- libmd-dev
- on amd64: [ libipsec-mb-dev ]
- stress-ng
after: [fwts]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
Expand Down
34 changes: 6 additions & 28 deletions checkbox-core-snap/series22/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ slots:
package-repositories:
- type: apt
ppa: checkbox-dev/stable
- type: apt
ppa: colin-king/stress-ng

parts:
version-calculator:
Expand Down Expand Up @@ -104,36 +106,12 @@ parts:
- libbsd-dev
after: [version-calculator]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
stress-ng:
source-tag: "V0.15.09"
source-depth: 1
plugin: make
build-environment:
- CFLAGS: "-fstack-protector-strong -Wformat -Werror=format-security"
- LDFLAGS: "-Wl,-z,relro -lrt"
source: https://github.com/ColinIanKing/stress-ng.git
make-parameters:
- STATIC=1 VERBOSE=1
plugin: nil
stage-packages:
- stress-ng
build-packages:
- gcc
- make
- zlib1g-dev
- libbsd-dev
- libgcrypt20-dev
- libkeyutils-dev
- libapparmor-dev
- libaio-dev
- libcap-dev
- libsctp-dev
- libatomic1
- libjudy-dev
- libjpeg-dev
- libkmod-dev
- libattr1-dev
- libxxhash-dev
- libmd-dev
- on amd64: [ libipsec-mb-dev ]
- stress-ng
after: [fwts]
################################################################################
# Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml
Expand Down
4 changes: 4 additions & 0 deletions checkbox-core-snap/series24/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ slots:
read:
- /

package-repositories:
- type: apt
ppa: colin-king/stress-ng

parts:
version-calculator:
plugin: dump
Expand Down