diff --git a/cmd/chisel/cmd_cut.go b/cmd/chisel/cmd_cut.go index 35c81a79a..2d6240000 100644 --- a/cmd/chisel/cmd_cut.go +++ b/cmd/chisel/cmd_cut.go @@ -66,10 +66,10 @@ func (cmd *cmdCut) Execute(args []string) error { if time.Now().Before(release.Maintenance.Standard) { if slices.Contains(cmd.Ignore, "unstable") { logf(`Warning: This release is in the "unstable" maintenance status. ` + - `See https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance to be safe`) + `See https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance to be safe`) } else { return fmt.Errorf(`this release is in the "unstable" maintenance status, ` + - `see https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance for details`) + `see https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance for details`) } } @@ -113,11 +113,11 @@ func (cmd *cmdCut) Execute(args []string) error { if slices.Contains(cmd.Ignore, "unmaintained") { logf(`Warning: No archive has "maintained" maintenance status. ` + `Consider the different Ubuntu Pro subscriptions to be safe. ` + - `See https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance for details.`) + `See https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance for details.`) } else { return fmt.Errorf(`no archive has "maintained" maintenance status, ` + `consider the different Ubuntu Pro subscriptions to be safe, ` + - `see https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance for details`) + `see https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance for details`) } } diff --git a/tests/unmaintained/task.yaml b/tests/unmaintained/task.yaml index ea58b625c..dc6cddfdc 100644 --- a/tests/unmaintained/task.yaml +++ b/tests/unmaintained/task.yaml @@ -11,10 +11,10 @@ execute: | # TODO: change to the upstream release when it has maintenance set. ! OUTPUT=$(chisel cut --release ./release-${RELEASE} --root ${ROOTFS} hello_bins 2>&1) - echo "$OUTPUT" | grep "no archive has \"maintained\" maintenance status, consider the different Ubuntu Pro subscriptions to be safe, see https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance for details" + echo "$OUTPUT" | grep "no archive has \"maintained\" maintenance status, consider the different Ubuntu Pro subscriptions to be safe, see https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance for details" OUTPUT=$(chisel cut --release ./release-${RELEASE} --root ${ROOTFS} --ignore=unmaintained hello_bins 2>&1) - echo "$OUTPUT" | grep "Warning: No archive has \"maintained\" maintenance status. Consider the different Ubuntu Pro subscriptions to be safe. See https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance for details." + echo "$OUTPUT" | grep "Warning: No archive has \"maintained\" maintenance status. Consider the different Ubuntu Pro subscriptions to be safe. See https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance for details." test -f ${ROOTFS}/usr/bin/hello test -f ${ROOTFS}/usr/share/doc/hello/copyright diff --git a/tests/unstable/task.yaml b/tests/unstable/task.yaml index 114596466..91124b695 100644 --- a/tests/unstable/task.yaml +++ b/tests/unstable/task.yaml @@ -22,10 +22,10 @@ execute: | yq -i '.maintenance.end-of-life = "2200-01-01"' ./release-${RELEASE}/chisel.yaml ! OUTPUT=$(chisel cut --release ./release-${RELEASE} --root ${ROOTFS} hello_bins 2>&1) - echo "$OUTPUT" | grep "this release is in the \"unstable\" maintenance status, see https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance for details" + echo "$OUTPUT" | grep "this release is in the \"unstable\" maintenance status, see https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance for details" OUTPUT=$(chisel cut --release ./release-${RELEASE} --root ${ROOTFS} --ignore=unstable hello_bins 2>&1) - echo "$OUTPUT" | grep "Warning: This release is in the \"unstable\" maintenance status. See https://documentation.ubuntu.com/chisel/en/latest/reference/chisel-releases/chisel.yaml/#maintenance to be safe" + echo "$OUTPUT" | grep "Warning: This release is in the \"unstable\" maintenance status. See https://ubuntu.com/chisel/docs/latest/reference/chisel-releases/chisel.yaml/#maintenance to be safe" test -f ${ROOTFS}/usr/bin/hello test -f ${ROOTFS}/usr/share/doc/hello/copyright