Skip to content

Commit

Permalink
Merge pull request #151 from SUSE/for-deploy-3
Browse files Browse the repository at this point in the history
🤖: Update build recipes for SP3
  • Loading branch information
dcermak authored Dec 8, 2022
2 parents 07aaeba + 87c827b commit dae7a64
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 7 deletions.
59 changes: 58 additions & 1 deletion .obs/workflows.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
workflow:
staging_build:
steps:
- branch_package:
source_project: home:defolos:BCI:CR:SLE-15-SP3
Expand Down Expand Up @@ -65,3 +65,60 @@ workflow:
source_project: home:defolos:BCI:CR:SLE-15-SP3
source_package: micro
target_project: home:defolos:BCI:CR:SLE-15-SP3:Staging
filters:
event: pull_request

refresh_devel_BCI:
steps:
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: python-3.6
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: python-3.9
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: rmt-nginx
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: pcp-image
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: rmt-server
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: golang-1.18
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: ruby-2.5-image
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: nodejs-14
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: nodejs-16
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: openjdk-11-devel
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: openjdk-11
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: init
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: rmt-mariadb
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: rmt-mariadb-client
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: minimal
- trigger_services:
project: devel:BCI:SLE-15-SP3
package: micro
filters:
branches:
only:
- sle15-sp3
5 changes: 5 additions & 0 deletions openjdk-11-devel/openjdk-11-devel.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 7 15:13:03 UTC 2022 - Dan Čermák <[email protected]>

- Fix environment variables (bsc#1206128)

-------------------------------------------------------------------
Wed Nov 23 10:07:43 UTC 2022 - Dan Čermák <[email protected]>

Expand Down
6 changes: 3 additions & 3 deletions openjdk-11-devel/openjdk-11-devel.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
</labels>
<subcommand execute="/usr/bin/jshell"/>
<environment>
<env name="JAVA_BINDIR" value="/usr/lib64/jvm/java/bin"/>
<env name="JAVA_HOME" value="/usr/lib64/jvm/java"/>
<env name="JAVA_ROOT" value="/usr/lib64/jvm/java"/>
<env name="JAVA_BINDIR" value="/usr/lib64/jvm/java-11-openjdk-11/bin"/>
<env name="JAVA_HOME" value="/usr/lib64/jvm/java-11-openjdk-11"/>
<env name="JAVA_ROOT" value="/usr/lib64/jvm/java-11-openjdk-11"/>
<env name="JAVA_VERSION" value="11"/>
</environment>

Expand Down
5 changes: 5 additions & 0 deletions openjdk-11/openjdk-11.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 7 15:13:03 UTC 2022 - Dan Čermák <[email protected]>

- Fix environment variables (bsc#1206128)

-------------------------------------------------------------------
Wed Nov 23 10:10:18 UTC 2022 - Dan Čermák <[email protected]>

Expand Down
6 changes: 3 additions & 3 deletions openjdk-11/openjdk-11.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
</suse_label_helper:add_prefix>
</labels>
<environment>
<env name="JAVA_BINDIR" value="/usr/lib64/jvm/java/bin"/>
<env name="JAVA_HOME" value="/usr/lib64/jvm/java"/>
<env name="JAVA_ROOT" value="/usr/lib64/jvm/java"/>
<env name="JAVA_BINDIR" value="/usr/lib64/jvm/java-11-openjdk-11/bin"/>
<env name="JAVA_HOME" value="/usr/lib64/jvm/java-11-openjdk-11"/>
<env name="JAVA_ROOT" value="/usr/lib64/jvm/java-11-openjdk-11"/>
<env name="JAVA_VERSION" value="11"/>
</environment>

Expand Down

0 comments on commit dae7a64

Please sign in to comment.