Skip to content

Conversation

@Fedosin
Copy link
Contributor

@Fedosin Fedosin commented Jan 24, 2020

This commit is a result of running:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.4/44.81.202001240222.0/x86_64/meta.json amd64

$ ./differ.py --first-endpoint art --first-version 44.81.202001171431.0 --second-endpoint art --second-version 44.81.202001240222.0
{
    "sources": {
        "44.81.202001171431.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001171431.0/x86_64/commitmeta.json",
        "44.81.202001240222.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001240222.0/x86_64/commitmeta.json"
    },
    "diff": {
        "cri-o": {
            "44.81.202001171431.0": "cri-o-1.17.0-0.2.rc1.rhaos4.4.gitb89a5fc.el8.x86_64",
            "44.81.202001240222.0": "cri-o-1.16.2-6.dev.rhaos4.3.git9e3db66.el8.x86_64"
        },
        "dracut": {
            "44.81.202001171431.0": "dracut-049-27.git20190906.el8_1.1.x86_64",
            "44.81.202001240222.0": "dracut-049-63.git20200114.el8.x86_64"
        },
        "dracut-network": {
            "44.81.202001171431.0": "dracut-network-049-27.git20190906.el8_1.1.x86_64",
            "44.81.202001240222.0": "dracut-network-049-63.git20200114.el8.x86_64"
        },
        "ignition": {
            "44.81.202001171431.0": "ignition-0.34.0-1.rhaos4.3.git92f874c.el8.x86_64",
            "44.81.202001240222.0": "ignition-0.35.0-0.rhaos4.4.git7afbeba.el8.x86_64"
        },
        "machine-config-daemon": {
            "44.81.202001171431.0": "machine-config-daemon-4.4.0-202001171301.git.1.6ff280e.el8.x86_64",
            "44.81.202001240222.0": "machine-config-daemon-4.4.0-202001232316.git.1.2405544.el8.x86_64"
        },
        "openshift-clients": {
            "44.81.202001171431.0": "openshift-clients-4.4.0-201912191316.git.1.83c50cc.el8.x86_64",
            "44.81.202001240222.0": "openshift-clients-4.4.0-202001222020.git.1.0b968f5.el8.x86_64"
        },
        "openshift-hyperkube": {
            "44.81.202001171431.0": "openshift-hyperkube-4.4.0-202001171132.git.0.fc97f82.el8.x86_64",
            "44.81.202001240222.0": "openshift-hyperkube-4.4.0-202001232117.git.0.03df719.el8.x86_64"
        }
    }
}

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 24, 2020
@Fedosin
Copy link
Contributor Author

Fedosin commented Jan 24, 2020

/test verify-vendor

@wking
Copy link
Member

wking commented Jan 24, 2020

Can you paste in how you invoked update-rhcos-bootimage.py into the commit message so the next caller just has to git log data/data/rhcos* to see how to make subsequent bumps? Looks like 068e3df (#2826) may have been the last time someone put that into the commit message (thanks, @patrickdillon :).

@wking
Copy link
Member

wking commented Jan 24, 2020

Also would be nice to include:

$ differ.py --first-endpoint art --first-version 44.81.202001171431.0 --second-endpoint art --second-version 44.81.202001232331.0
{
    "diff": {
        "dracut-network": {
            "44.81.202001171431.0": "dracut-network.0.049.27.git20190906.el8_1.1.x86_64",
            "44.81.202001232331.0": "dracut-network.0.049.63.git20200114.el8.x86_64"
        },
        "openshift-clients": {
            "44.81.202001171431.0": "openshift-clients.0.4.4.0.201912191316.git.1.83c50cc.el8.x86_64",
            "44.81.202001232331.0": "openshift-clients.0.4.4.0.202001222020.git.1.0b968f5.el8.x86_64"
        },
        "cri-o": {
            "44.81.202001171431.0": "cri-o.0.1.17.0.0.2.rc1.rhaos4.4.gitb89a5fc.el8.x86_64",
            "44.81.202001232331.0": "cri-o.0.1.16.2.6.dev.rhaos4.3.git9e3db66.el8.x86_64"
        },
        "ignition": {
            "44.81.202001171431.0": "ignition.0.0.34.0.1.rhaos4.3.git92f874c.el8.x86_64",
            "44.81.202001232331.0": "ignition.0.0.35.0.0.rhaos4.4.git7afbeba.el8.x86_64"
        },
        "dracut": {
            "44.81.202001171431.0": "dracut.0.049.27.git20190906.el8_1.1.x86_64",
            "44.81.202001232331.0": "dracut.0.049.63.git20200114.el8.x86_64"
        },
        "openshift-hyperkube": {
            "44.81.202001171431.0": "openshift-hyperkube.0.4.4.0.202001171132.git.0.fc97f82.el8.x86_64",
            "44.81.202001232331.0": "openshift-hyperkube.0.4.4.0.202001232117.git.0.03df719.el8.x86_64"
        },
        "machine-config-daemon": {
            "44.81.202001171431.0": "machine-config-daemon.0.4.4.0.202001171301.git.1.6ff280e.el8.x86_64",
            "44.81.202001232331.0": "machine-config-daemon.0.4.4.0.202001232117.git.1.cc93429.el8.x86_64"
        }
    },
    "sources": {
        "44.81.202001171431.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001171431.0/x86_64/commitmeta.json",
        "44.81.202001232331.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001232331.0/x86_64/commitmeta.json"
    }
}

in the commit messages. Looks like this has a CRI-O rollback tied up with rhbz#1792749 and rhbz#1794493, and the Ignition bump you need for #2960.

@wking
Copy link
Member

wking commented Jan 24, 2020

CC @openshift/openshift-team-red-hat-coreos @openshift/openshift-team-mco

@wking
Copy link
Member

wking commented Jan 24, 2020

5e3dd549817c looks good to me, but I'll wait for the RHCOS and MCO folks to weigh in tomorrow.

@runcom
Copy link
Member

runcom commented Jan 24, 2020

Have zero context about what this bump is bringing but it looks good - Sinny was also about to bump the boot image to bring in a new mcd

@sinnykumari
Copy link
Contributor

I missed this PR before creating another one at #2974
@Fedosin Can you please bump RHCOS with 44.81.202001240222.0 ? We need the machine-confg-daemon package version >= 4.4.0-202001232316.git.1.2405544.el8 available there

@Fedosin
Copy link
Contributor Author

Fedosin commented Jan 24, 2020

@runcom this bump is required for Swiftless installations: #2960, it includes Ignition 0.35

@Fedosin Fedosin changed the title Bump RHCOS to 44.81.202001232331.0 Bump RHCOS to 44.81.202001240222.0 Jan 24, 2020
@Fedosin
Copy link
Contributor Author

Fedosin commented Jan 24, 2020

@sinnykumari done

@runcom
Copy link
Member

runcom commented Jan 24, 2020

Thanks @Fedosin!

Copy link
Member

@ashcrow ashcrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @miabbott for visibility as well

@miabbott
Copy link
Member

New differ output for completeness:

$ ./differ.py --first-endpoint art --first-version 44.81.202001171431.0 --second-endpoint art --second-version 44.81.202001240222.0
{
    "sources": {
        "44.81.202001171431.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001171431.0/x86_64/commitmeta.json",
        "44.81.202001240222.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001240222.0/x86_64/commitmeta.json"
    },
    "diff": {
        "cri-o": {
            "44.81.202001171431.0": "cri-o-1.17.0-0.2.rc1.rhaos4.4.gitb89a5fc.el8.x86_64",
            "44.81.202001240222.0": "cri-o-1.16.2-6.dev.rhaos4.3.git9e3db66.el8.x86_64"
        },
        "dracut": {
            "44.81.202001171431.0": "dracut-049-27.git20190906.el8_1.1.x86_64",
            "44.81.202001240222.0": "dracut-049-63.git20200114.el8.x86_64"
        },
        "dracut-network": {
            "44.81.202001171431.0": "dracut-network-049-27.git20190906.el8_1.1.x86_64",
            "44.81.202001240222.0": "dracut-network-049-63.git20200114.el8.x86_64"
        },
        "ignition": {
            "44.81.202001171431.0": "ignition-0.34.0-1.rhaos4.3.git92f874c.el8.x86_64",
            "44.81.202001240222.0": "ignition-0.35.0-0.rhaos4.4.git7afbeba.el8.x86_64"
        },
        "machine-config-daemon": {
            "44.81.202001171431.0": "machine-config-daemon-4.4.0-202001171301.git.1.6ff280e.el8.x86_64",
            "44.81.202001240222.0": "machine-config-daemon-4.4.0-202001232316.git.1.2405544.el8.x86_64"
        },
        "openshift-clients": {
            "44.81.202001171431.0": "openshift-clients-4.4.0-201912191316.git.1.83c50cc.el8.x86_64",
            "44.81.202001240222.0": "openshift-clients-4.4.0-202001222020.git.1.0b968f5.el8.x86_64"
        },
        "openshift-hyperkube": {
            "44.81.202001171431.0": "openshift-hyperkube-4.4.0-202001171132.git.0.fc97f82.el8.x86_64",
            "44.81.202001240222.0": "openshift-hyperkube-4.4.0-202001232117.git.0.03df719.el8.x86_64"
        }
    }
}

/approve

This commit is a result of running:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.4/44.81.202001240222.0/x86_64/meta.json amd64

$ ./differ.py --first-endpoint art --first-version 44.81.202001171431.0 --second-endpoint art --second-version 44.81.202001240222.0
{
    "sources": {
        "44.81.202001171431.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001171431.0/x86_64/commitmeta.json",
        "44.81.202001240222.0": "https://releases-rhcos-art.cloud.privileged.psi.redhat.com/storage/releases/rhcos-4.4/44.81.202001240222.0/x86_64/commitmeta.json"
    },
    "diff": {
        "cri-o": {
            "44.81.202001171431.0": "cri-o-1.17.0-0.2.rc1.rhaos4.4.gitb89a5fc.el8.x86_64",
            "44.81.202001240222.0": "cri-o-1.16.2-6.dev.rhaos4.3.git9e3db66.el8.x86_64"
        },
        "dracut": {
            "44.81.202001171431.0": "dracut-049-27.git20190906.el8_1.1.x86_64",
            "44.81.202001240222.0": "dracut-049-63.git20200114.el8.x86_64"
        },
        "dracut-network": {
            "44.81.202001171431.0": "dracut-network-049-27.git20190906.el8_1.1.x86_64",
            "44.81.202001240222.0": "dracut-network-049-63.git20200114.el8.x86_64"
        },
        "ignition": {
            "44.81.202001171431.0": "ignition-0.34.0-1.rhaos4.3.git92f874c.el8.x86_64",
            "44.81.202001240222.0": "ignition-0.35.0-0.rhaos4.4.git7afbeba.el8.x86_64"
        },
        "machine-config-daemon": {
            "44.81.202001171431.0": "machine-config-daemon-4.4.0-202001171301.git.1.6ff280e.el8.x86_64",
            "44.81.202001240222.0": "machine-config-daemon-4.4.0-202001232316.git.1.2405544.el8.x86_64"
        },
        "openshift-clients": {
            "44.81.202001171431.0": "openshift-clients-4.4.0-201912191316.git.1.83c50cc.el8.x86_64",
            "44.81.202001240222.0": "openshift-clients-4.4.0-202001222020.git.1.0b968f5.el8.x86_64"
        },
        "openshift-hyperkube": {
            "44.81.202001171431.0": "openshift-hyperkube-4.4.0-202001171132.git.0.fc97f82.el8.x86_64",
            "44.81.202001240222.0": "openshift-hyperkube-4.4.0-202001232117.git.0.03df719.el8.x86_64"
        }
    }
}
@Fedosin
Copy link
Contributor Author

Fedosin commented Jan 24, 2020

I updated the commit message to include the output of differ.py. Code is the same.

@mandre
Copy link
Member

mandre commented Jan 24, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 24, 2020
@Fedosin
Copy link
Contributor Author

Fedosin commented Jan 24, 2020

/test e2e-aws-fips

@sdodson
Copy link
Member

sdodson commented Jan 24, 2020

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashcrow, miabbott, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2020
@openshift-merge-robot openshift-merge-robot merged commit e2fd2b3 into openshift:master Jan 24, 2020
@openshift-ci-robot
Copy link
Contributor

@Fedosin: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-ovirt 02706a9 link /test e2e-ovirt
ci/prow/e2e-libvirt 02706a9 link /test e2e-libvirt
ci/prow/e2e-aws-scaleup-rhel7 02706a9 link /test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants