diff --git a/multi-arch-builders/README.md b/multi-arch-builders/README.md index d44e1d10a..b75720f2f 100644 --- a/multi-arch-builders/README.md +++ b/multi-arch-builders/README.md @@ -127,13 +127,10 @@ ibmcloud plugin install infrastructure-service ibmcloud login --sso ``` -Create the Ignition config in a separate terminal and copy it into the -container where ibmcloud is running: +Grab the Butane config: ```bash -cat builder-common.bu | butane --pretty --strict > builder-common.ign -cat coreos-s390x-builder.bu | butane --pretty --strict --files-dir=. > coreos-s390x-builder.ign -podman cp coreos-s390x-builder.ign ibmcloud:/root/coreos-s390x-builder.ign +curl -O https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/coreos-s390x-builder.bu ``` 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)" PROFILE='bz2-8x32' ibmcloud is instance-create $NAME $VPC $ZONE $PROFILE $SUBNET --output json --image-id $IMAGE \ --boot-volume '{"name": "my-boot-vol-1", "volume": {"capacity": 200, "profile": {"name": "general-purpose"}}}' \ - --sgs $SG --user-data @coreos-s390x-builder.ign > out.json + --sgs $SG --user-data @coreos-s390x-builder.bu > out.json ``` diff --git a/multi-arch-builders/coreos-s390x-builder.bu b/multi-arch-builders/coreos-s390x-builder.bu index d690a02a9..0323ece57 100644 --- a/multi-arch-builders/coreos-s390x-builder.bu +++ b/multi-arch-builders/coreos-s390x-builder.bu @@ -1,6 +1,6 @@ # This butane config will do the following: # -# - Merge in the builder-common.ign Ignition file +# - Merge in the builder-common.bu Butane file # - Allow the builder user to log in with the associated ssh key # - Set a hostname # @@ -8,8 +8,7 @@ variant: fcos version: 1.4.0 ignition: config: - merge: - - local: builder-common.ign + - source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/builder-common.bu passwd: users: - name: builder diff --git a/multi-arch-builders/coreos-s390x-rhcos-builder.bu b/multi-arch-builders/coreos-s390x-rhcos-builder.bu index c091eafb3..53ba56894 100644 --- a/multi-arch-builders/coreos-s390x-rhcos-builder.bu +++ b/multi-arch-builders/coreos-s390x-rhcos-builder.bu @@ -1,7 +1,7 @@ # This butane config will do the following: # -# - Merge in the coreos-s390x-builder.ign Ignition file -# - Merge in the builder-splunk.ign Ignition file +# - Merge in the coreos-s390x-builder.bu Butane file +# - Merge in the builder-splunk.bu Butane file # - Enable the Secure Execution Host # - Create and initialize the secex-data volume # - Enable the Cex hardware based luks encryption @@ -10,9 +10,8 @@ variant: fcos version: 1.4.0 ignition: config: - merge: - - local: coreos-s390x-builder.ign - - local: builder-splunk.ign + - source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/coreos-s390x-builder.bu + - source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/builder-splunk.bu kernel_arguments: should_exist: # enables Secure Execution Host @@ -111,4 +110,4 @@ storage: group: name: root contents: - local: create-cex-device.sh \ No newline at end of file + source: https://github.com/coreos/fedora-coreos-pipeline/raw/refs/heads/main/multi-arch-builders/create-cex-device.sh