Stress-ng from the PPA (infra) (#1425)

Stress-ng from the PPA
canonical · Aug 23, 2024 · d0fd309 · d0fd309
1 parent d725523
commit d0fd309
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 112 deletions.
diff --git a/checkbox-core-snap/series16/snap/snapcraft.yaml b/checkbox-core-snap/series16/snap/snapcraft.yaml
@@ -55,6 +55,8 @@ slots:
 package-repositories:
  - type: apt
  ppa: checkbox-dev/stable
+ - type: apt
+ ppa: colin-king/stress-ng
 
 parts:
  version-calculator:
@@ -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

diff --git a/checkbox-core-snap/series18/snap/snapcraft.yaml b/checkbox-core-snap/series18/snap/snapcraft.yaml
@@ -59,6 +59,8 @@ slots:
 package-repositories:
  - type: apt
  ppa: checkbox-dev/stable
+ - type: apt
+ ppa: colin-king/stress-ng
 
 parts:
  version-calculator:
@@ -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

diff --git a/checkbox-core-snap/series20/snap/snapcraft.yaml b/checkbox-core-snap/series20/snap/snapcraft.yaml
@@ -59,6 +59,8 @@ slots:
 package-repositories:
  - type: apt
  ppa: checkbox-dev/stable
+ - type: apt
+ ppa: colin-king/stress-ng
 
 parts:
  version-calculator:
@@ -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

diff --git a/checkbox-core-snap/series22/snap/snapcraft.yaml b/checkbox-core-snap/series22/snap/snapcraft.yaml
@@ -63,6 +63,8 @@ slots:
 package-repositories:
  - type: apt
  ppa: checkbox-dev/stable
+ - type: apt
+ ppa: colin-king/stress-ng
 
 parts:
  version-calculator:
@@ -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

diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml
@@ -60,6 +60,10 @@ slots:
  read:
  - /
 
+package-repositories:
+ - type: apt
+ ppa: colin-king/stress-ng
+
 parts:
  version-calculator:
  plugin: dump