From bd78bd8780076b62e0492e497c8903990231eafe Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Mon, 24 Jun 2024 11:24:30 +0200 Subject: [PATCH 1/2] Leap 16 use pkglistgen with product-composer --- gocd/pkglistgen.opensuse.gocd.yaml | 2 +- gocd/pkglistgen.opensuse.gocd.yaml.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml index 8730a7c4..07c89bcd 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml +++ b/gocd/pkglistgen.opensuse.gocd.yaml @@ -128,7 +128,7 @@ pipelines: resources: - repo-checker tasks: - - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:16.0 -s target + - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project openSUSE:Leap:Micro:6.0 --scope target --engine product_composer --force Pkglistgen.openSUSE_Leap_15.6: group: Leap lock_behavior: unlockWhenFinished diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb index 80fb799d..87ec2084 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml.erb +++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb @@ -85,6 +85,7 @@ pipelines: resources: - repo-checker tasks: + - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project <%= project[0] %> --scope target --engine product_composer --force - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %> <% end -%> Pkglistgen.openSUSE_Leap_15.6: From 3e0106102070d9186aee5bea13c4848986c135b1 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Mon, 24 Jun 2024 11:26:31 +0200 Subject: [PATCH 2/2] Leap 16 pkligsten use correct project --- gocd/pkglistgen.opensuse.gocd.yaml | 2 +- gocd/pkglistgen.opensuse.gocd.yaml.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gocd/pkglistgen.opensuse.gocd.yaml b/gocd/pkglistgen.opensuse.gocd.yaml index 07c89bcd..73050abb 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml +++ b/gocd/pkglistgen.opensuse.gocd.yaml @@ -128,7 +128,7 @@ pipelines: resources: - repo-checker tasks: - - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project openSUSE:Leap:Micro:6.0 --scope target --engine product_composer --force + - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project openSUSE:Leap:16.0 --scope target --engine product_composer --force Pkglistgen.openSUSE_Leap_15.6: group: Leap lock_behavior: unlockWhenFinished diff --git a/gocd/pkglistgen.opensuse.gocd.yaml.erb b/gocd/pkglistgen.opensuse.gocd.yaml.erb index 87ec2084..4afce794 100644 --- a/gocd/pkglistgen.opensuse.gocd.yaml.erb +++ b/gocd/pkglistgen.opensuse.gocd.yaml.erb @@ -85,8 +85,7 @@ pipelines: resources: - repo-checker tasks: - - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project <%= project[0] %> --scope target --engine product_composer --force - - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %> + - script: ./pkglistgen.py --verbose -A https://api.opensuse.org update_and_solve --project <%= project[0] %> --scope target --engine product_composer --force <% end -%> Pkglistgen.openSUSE_Leap_15.6: group: Leap