From d82bfa00ec194125bcb29df6fd3b27fd4418736b Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 18 Aug 2020 16:36:40 +0200 Subject: [PATCH] release-process.adoc: Skip master and go straight to dunfell. It is not worth the effort to deal with maintaining master anymore, so we now treat dunfell basically as we used to treat master. Signed-off-by: Patrick Vacek --- docs/ota-client-guide/modules/ROOT/pages/release-process.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ota-client-guide/modules/ROOT/pages/release-process.adoc b/docs/ota-client-guide/modules/ROOT/pages/release-process.adoc index 1ac16b38d9..3012692a0f 100644 --- a/docs/ota-client-guide/modules/ROOT/pages/release-process.adoc +++ b/docs/ota-client-guide/modules/ROOT/pages/release-process.adoc @@ -169,6 +169,6 @@ Newly created releases automatically trigger an OTF pipeline in gitlab. Currentl == Update meta-updater -The version of aktualizr used by link:https://github.com/advancedtelematic/meta-updater/[meta-updater] should be updated to match the new release. First, open a PR against master that updates aktualizr to the same commit used in the newly released tag. This is also a good time to update the aktualizr recipe to pull the latest version of link:https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/index.html[garage-sign]. +The version of aktualizr used by link:https://github.com/advancedtelematic/meta-updater/[meta-updater] should be updated to match the new release. First, open a PR against dunfell that updates aktualizr to the same commit used in the newly released tag. (Historically, we started with master, but we now skip straight to dunfell.) This is also a good time to update the aktualizr recipe to pull the latest version of link:https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/index.html[garage-sign]. -Once that PR has passed oe-selftest, successfully passed review, and gotten merged, you should then backport that change, along with anything else relevant since the last backport was done, to the xref:yocto-release-branches.adoc[currently supported release branches]. Note that while master is allowed to use arbitrary recent version of aktualizr, the release branches should only use released versions of aktualizr. +Once that PR has passed oe-selftest, successfully passed review, and gotten merged, you should then backport that change, along with anything else relevant since the last backport was done, to the other xref:yocto-release-branches.adoc[currently supported release branches]. Note that while master is allowed to use arbitrary recent version of aktualizr, the release branches should only use released versions of aktualizr.