Hi,

here's patch that should fix 4.0 -> master upgrade issue for now:

https://gerrit.ovirt.org/58936


Martin


On Thu, Jun 9, 2016 at 5:04 PM, Martin Perina <mperina@redhat.com> wrote:
It seems to me, that our 4.0 upgrade scripts in master and ovirt-engine-4.0 are not in sync again. I will investigate and post a new fix for that.

This issue will be definitely fixed next week, when Eli posts a patch bumping database version to 4.1 on master branch.

Martin


On Thu, Jun 9, 2016 at 4:59 PM, Yedidyah Bar David <didi@redhat.com> wrote:
On Thu, Jun 9, 2016 at 5:38 PM, Jenkins CI <gerrit2@gerrit.ovirt.org> wrote:
> Jenkins CI has posted comments on this change.
>
> Change subject: packaging: setup: Always update ovirt-engine-dashboard
> ......................................................................
>
>
> Patch Set 3:
>
> Build Failed
>
> http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-4.0_el7_merged/150/ : FAILURE

In server.log:

Caused by: org.postgresql.util.PSQLException: ERROR: column
c.mac_pool_id does not exist

It seems like it was supposed to be fixed by:

https://gerrit.ovirt.org/58604

In ovirt-engine-setup-20160609142049-s4dyhe.log I see:

Skipping upgrade script
/usr/share/ovirt-engine/dbscripts/upgrade/04_00_0770_remove_filter_from_passthrough_vnics.sql,
already installed by 04000730

And I see no mention of 0720 anywhere there.

Adding also Eli.

>
> http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-el7-x86_64/600/ : SUCCESS
>
> http://jenkins.ovirt.org/job/ovirt-engine_master_check-merged-fc23-x86_64/600/ : SUCCESS
>
> http://jenkins.ovirt.org/job/ovirt-engine_master_upgrade-from-master_el7_merged/615/ : SUCCESS
>
> --
> To view, visit https://gerrit.ovirt.org/58629
> To unsubscribe, visit https://gerrit.ovirt.org/settings
>
> Gerrit-MessageType: comment
> Gerrit-Change-Id: I21d9bc56278c720ddfc26b00f8bb64932fbab465
> Gerrit-PatchSet: 3
> Gerrit-Project: ovirt-engine
> Gerrit-Branch: master
> Gerrit-Owner: Yedidyah Bar David <didi@redhat.com>
> Gerrit-Reviewer: Jenkins CI
> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com>
> Gerrit-Reviewer: Simone Tiraboschi <stirabos@redhat.com>
> Gerrit-Reviewer: Yedidyah Bar David <didi@redhat.com>
> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>
> Gerrit-HasComments: No



--
Didi