#234 atomic: move to new versioning scheme for ostree
Merged 6 years ago by ausil. Opened 6 years ago by dustymabe.
dustymabe/pungi-fedora dusty-rawhide  into  master

file modified
+3
@@ -711,6 +711,7 @@ 

  ostree = [

      ("^Atomic$", {

          "aarch64": {

+             "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',

              "treefile": "fedora-atomic-docker-host.json",

              "config_url": "https://pagure.io/fedora-atomic.git",

              "config_branch": "master",
@@ -719,6 +720,7 @@ 

              'failable': ['*'],

          },

          "x86_64": {

+             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

              "treefile": "fedora-atomic-docker-host.json",

              "config_url": "https://pagure.io/fedora-atomic.git",

              "config_branch": "master",
@@ -727,6 +729,7 @@ 

              'failable': ['*'],

          },

          "ppc64le": {

+             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

              "treefile": "fedora-atomic-docker-host.json",

              "config_url": "https://pagure.io/fedora-atomic.git",

              "config_branch": "master",

We have decided [1] that we want to have more meaningful versions
for ostree commits and the resulting images. One way to do this
is to have the ostree version match the version from the compose ID.

Pungi recently [2] gained support for embedding the label from the
compose into the ostree commit version. This change takes advantage
of that work to embed a more meaninful version.

[1] https://pagure.io/atomic-wg/issue/229
[2] https://pagure.io/pungi/pull-request/592

rebased

6 years ago

Syntax wise looks good to me.

I am not sure this will give you what you want. but hey lets try

Pull-Request has been merged by ausil

6 years ago

I am not sure this will give you what you want. but hey lets try

no? what am I missing?

the compose id is the same value as what we have been using

the compose id is the same value as what we have been using

hey @ausil - so we haven't had a successfull compose since this change was merged so there isn't a way to tell if this change had an effect or not.

Here is what I have today:

[root@localhost ~]# rpm-ostree status
State: idle
Deployments:
● fedora-atomic:fedora/rawhide/x86_64/atomic-host
             Version: 25.44 (2017-05-22 12:02:15)
              Commit: 39b52552979afde8f26f3518bbddaaddf2859cb7948f4e2561ab611273dea534

  fedora-atomic:fedora/rawhide/x86_64/atomic-host
             Version: 25.43 (2017-05-21 12:06:50)
              Commit: b65f8b66ec81557bd3798df7ed951fcbb1d6cdf2b8efe74783885200791620a7

The hope is that this change will make the version be something like 20170522.0 instead of 25.44.

from today's compose:

[root@localhost ~]# rpm-ostree status
State: idle
Deployments:
● fedora-atomic:fedora/rawhide/x86_64/atomic-host
             Version: Rawhide.20170526.n.0 (2017-05-26 12:54:57)
              Commit: 784ba2b1b0e848734455faa5586544dccc26efc52ecda68cfc3bec6db0285e0c

  fedora-atomic:fedora/rawhide/x86_64/atomic-host
             Version: 25.44 (2017-05-22 12:02:15)
              Commit: 39b52552979afde8f26f3518bbddaaddf2859cb7948f4e2561ab611273dea534

looks like it is doing what we want.

The Rawhide there seems redundant no?

Oh, or maybe we did decide we needed that, nevermind.

Metadata