Skip to content

Commit

Permalink
Better buildomat output
Browse files Browse the repository at this point in the history
  • Loading branch information
smklein committed Mar 27, 2024
1 parent 6d5459f commit b1a8bb7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/buildomat/jobs/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ VDEV_DIR=/scratch ptime -m pfexec ./tools/create_virtual_hardware.sh
tar xf out/omicron-sled-agent.tar pkg/config-rss.toml pkg/config.toml

# Update the vdevs to point to where we've created them
sed -i "s/\(m2\|u2\)\(.*\.vdev\)/\/scratch\/\1\2/g" pkg/config.toml
sed -i~ "s/\(m2\|u2\)\(.*\.vdev\)/\/scratch\/\1\2/g" pkg/config.toml
diff -u pkg/config.toml{~,} || true

SILO_NAME="$(sed -n 's/silo_name = "\(.*\)"/\1/p' pkg/config-rss.toml)"
EXTERNAL_DNS_DOMAIN="$(sed -n 's/external_dns_zone_name = "\(.*\)"/\1/p' pkg/config-rss.toml)"
Expand Down Expand Up @@ -246,7 +247,7 @@ addresses = \\[\"$UPLINK_IP/24\"\\]
diff -u pkg/config-rss.toml{~,} || true

tar rvf out/omicron-sled-agent.tar pkg/config-rss.toml pkg/config.toml
rm -f pkg/config-rss.toml* pkg/config.toml
rm -f pkg/config-rss.toml* pkg/config.toml*

#
# By default, OpenSSL creates self-signed certificates with "CA:true". The TLS
Expand Down

0 comments on commit b1a8bb7

Please sign in to comment.