Skip to content

Commit 0da38ea

Browse files
committed
multi-arch-builders: show changes for if we could use butane directly
1 parent 71bbc5e commit 0da38ea

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

multi-arch-builders/README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,10 @@ ibmcloud plugin install infrastructure-service
127127
ibmcloud login --sso
128128
```
129129

130-
Create the Ignition config in a separate terminal and copy it into the
131-
container where ibmcloud is running:
130+
Grab the Butane config:
132131

133132
```bash
134-
cat builder-common.bu | butane --pretty --strict > builder-common.ign
135-
cat coreos-s390x-builder.bu | butane --pretty --strict --files-dir=. > coreos-s390x-builder.ign
136-
podman cp coreos-s390x-builder.ign ibmcloud:/root/coreos-s390x-builder.ign
133+
curl -O https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/coreos-s390x-builder.bu
137134
```
138135

139136
We've occasionally seen some failures and/or capacity issues so we'll
@@ -165,7 +162,7 @@ NAME="coreos-s390x-builder-$(date +%Y%m%d)"
165162
PROFILE='bz2-8x32'
166163
ibmcloud is instance-create $NAME $VPC $ZONE $PROFILE $SUBNET --output json --image-id $IMAGE \
167164
--boot-volume '{"name": "my-boot-vol-1", "volume": {"capacity": 200, "profile": {"name": "general-purpose"}}}' \
168-
--sgs $SG --user-data @coreos-s390x-builder.ign > out.json
165+
--sgs $SG --user-data @coreos-s390x-builder.bu > out.json
169166
```
170167

171168

multi-arch-builders/coreos-s390x-builder.bu

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ variant: fcos
88
version: 1.4.0
99
ignition:
1010
config:
11-
merge:
12-
- local: builder-common.ign
11+
- source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/builder-common.bu
1312
passwd:
1413
users:
1514
- name: builder

0 commit comments

Comments
 (0)