From f57f0f9588d903393e7862116de9e938ff261c1a Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sun, 3 Jan 2021 20:50:32 +0100 Subject: [PATCH] Adapt complex selection fixtures to new changes We don't generate anymore images if packages are empty - those are now virtuals which just generates empty artifacts. Virtuals are not meant to be required by other packages in build time, because it would violate the virtual packages purpose (they are just useful for runtime). This test was used to verify version selection of the best match during build time, not to actually test any build process. Inject steps so images are actually generated, and they can depend on each others. --- tests/fixtures/complex/selection/0.20191212/build.yaml | 3 +++ tests/fixtures/complex/selection/kernel/build.yaml | 3 +++ tests/fixtures/complex/selection/meta/build.yaml | 3 +++ .../sabayon-build-overlays/portage/0.20191126/build.yaml | 2 ++ .../sabayon-build-overlays/portage/0.20191212/build.yaml | 2 ++ .../sabayon-overlay/0.20191205/build.yaml | 2 ++ tests/fixtures/complex/selection/sources5.4.2/build.yaml | 3 ++- 7 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/fixtures/complex/selection/0.20191212/build.yaml b/tests/fixtures/complex/selection/0.20191212/build.yaml index e75ca130..e5b9d726 100644 --- a/tests/fixtures/complex/selection/0.20191212/build.yaml +++ b/tests/fixtures/complex/selection/0.20191212/build.yaml @@ -15,3 +15,6 @@ requires: - category: "layer" name: "build-sabayon-overlay" version: "0.20191212" + +steps: +- echo "foo" \ No newline at end of file diff --git a/tests/fixtures/complex/selection/kernel/build.yaml b/tests/fixtures/complex/selection/kernel/build.yaml index 2d9deae8..d2cf708a 100644 --- a/tests/fixtures/complex/selection/kernel/build.yaml +++ b/tests/fixtures/complex/selection/kernel/build.yaml @@ -5,3 +5,6 @@ requires: includes: - /usr/portage/packages/.* + +steps: +- echo "foo" \ No newline at end of file diff --git a/tests/fixtures/complex/selection/meta/build.yaml b/tests/fixtures/complex/selection/meta/build.yaml index a867d28f..737746f2 100644 --- a/tests/fixtures/complex/selection/meta/build.yaml +++ b/tests/fixtures/complex/selection/meta/build.yaml @@ -16,3 +16,6 @@ requires: - category: "layer" name: "build-sabayon-overlay" version: ">=0.1" + +steps: +- echo "foo" \ No newline at end of file diff --git a/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191126/build.yaml b/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191126/build.yaml index b5219cc5..ecac41e5 100644 --- a/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191126/build.yaml +++ b/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191126/build.yaml @@ -2,3 +2,5 @@ requires: - category: "layer" name: "build" version: ">=0.1" +steps: +- echo "foo" \ No newline at end of file diff --git a/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191212/build.yaml b/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191212/build.yaml index 236120ac..9af1d574 100644 --- a/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191212/build.yaml +++ b/tests/fixtures/complex/selection/sabayon-build-overlays/portage/0.20191212/build.yaml @@ -2,3 +2,5 @@ requires: - category: "layer" version: "0.1" name: "build" +steps: +- echo "foo" \ No newline at end of file diff --git a/tests/fixtures/complex/selection/sabayon-build-overlays/sabayon-overlay/0.20191205/build.yaml b/tests/fixtures/complex/selection/sabayon-build-overlays/sabayon-overlay/0.20191205/build.yaml index d5241468..973d1aed 100644 --- a/tests/fixtures/complex/selection/sabayon-build-overlays/sabayon-overlay/0.20191205/build.yaml +++ b/tests/fixtures/complex/selection/sabayon-build-overlays/sabayon-overlay/0.20191205/build.yaml @@ -5,3 +5,5 @@ requires: - category: "layer" name: "sabayon-build-portage" version: ">=0.1" +steps: +- echo "foo" \ No newline at end of file diff --git a/tests/fixtures/complex/selection/sources5.4.2/build.yaml b/tests/fixtures/complex/selection/sources5.4.2/build.yaml index 2d9deae8..fe08ea84 100644 --- a/tests/fixtures/complex/selection/sources5.4.2/build.yaml +++ b/tests/fixtures/complex/selection/sources5.4.2/build.yaml @@ -2,6 +2,7 @@ requires: - category: "layer" version: "0.1" name: "build-sabayon-overlays" - +steps: +- echo "foo" includes: - /usr/portage/packages/.*