attachment
0001-Ticket-49024-Fix-CI-test-failures-and-defaults.inf.patch

attachment
0001-Ticket-49024-Fix-paths-in-tools-module.patch

Second patch is for lib389. It will fix some issues in the tests too.

Looks good!

Noriko has already acked, but these look good to me too! Thanks!

To ssh://git.fedorahosted.org/git/389/ds.git
095b720..299169e master -> master
commit 299169e
Author: Simon Pichugin spichugi@redhat.com
Date: Tue Nov 1 09:38:19 2016 +0100

To ssh://git.fedorahosted.org/git/389/lib389.git
619dabd..41d479e master -> master
commit 41d479eb20af3dfdee6de3576761945903772ca2
Author: Simon Pichugin spichugi@redhat.com

To be continued...

Please, review the new fixes. First patch is for ds.git and the second is for lib389.git.
I'll finish the rest of the failures in the beginning of next week.

I'm confused at your changes...

I thought:
{{{
confdir == /etc/dirsrv/slapd-INSTANCE
dbdir == /var/lib/dirsrv/slapd-INSTANCE
}}}

But according to your changes, they have these values now?
{{{
confdir == /var/lib/dirsrv/slapd-INSTANCE
dbdir == /var/lib/dirsrv/slapd-INSTANCE/db
}}}

Please note that bak dir for backup/restore and changelog dir for replication are located in /var/lib/dirsrv/slapd-INSTANCE as follows.
{{{

ls /var/lib/dirsrv/slapd-INSTANCE

bak changelogdb db ldif
}}}

Thank you, Noriko! You're right.
It should be inst_dir from defaults.inf, not confdir. Loading new patches for the fix...

attachment
0001-Ticket-49024-Fix-db_dir-paths.patch

attachment
0001-Ticket-49024-Fix-dbdir-paths-and-adjust-test-cases.patch

These two patches look good to me.

To ssh://git.fedorahosted.org/git/389/ds.git
54431ba..2c80c5c master -> master
commit 2c80c5c
Author: Simon Pichugin spichugi@redhat.com
Date: Fri Nov 4 17:35:32 2016 +0100

To ssh://git.fedorahosted.org/git/389/lib389.git
41d479e..241d3e7 master -> master
commit 241d3e718f1267187472cd3178c79e1d4d719944
Author: Simon Pichugin spichugi@redhat.com
Date: Fri Nov 4 12:40:26 2016 +0100

attachment
0001-Ticket-49024-Fix-inst_dir-parameter-in-defaults.inf.patch

attachment
0001-Ticket-49024-Fix-paths-to-the-dbdir-parent.patch

Small fixes to resolve failures from previous patch + defaults.inf parameter fix (inst_dir).

Hi,

Can you not change inst_dir? this means "where the instance data is kept". it is NOT the instances scripts.

If you look in configure.ac, the serverdir is not always what we want. On my machine it configured to "/dirsrv". Not right :(

With the second patch, because you change to dbdir, that means that you are in /var/lib/dirsrv/db, then the process looks for /var/lib/dirsrv/db/{bak,ldif} which also isn't right.

With the second patch, try just straight up removing backup_dir and ldif_dir. Remember, these values MAY NOT be relative to var/lib/dirsrv/slapd-instance/.... because they can be reconfigured! Better to just ask ds paths for them.

In most cases the inst_dir value shouldn't be needed, we should be using backup_dir, ldif_dir and db_dir directly.

{{{
db_dir = /opt/dirsrv/var/lib/dirsrv/slapd-{instance_name}/db
backup_dir = /opt/dirsrv/var/lib/dirsrv/slapd-{instance_name}/bak
ldif_dir = /opt/dirsrv/var/lib/dirsrv/slapd-{instance_name}/ldif

}}}

Hope that helps,

As discussed in IRC, I'm happy with these Simon!

For clarification, if someone will read this.

paths.py module gets inst_dir from nsslapd-instancedir attribute (cn=config) and it contains path to serverdir with the instances scripts.

For getting "/var/lib/dirsrv/" path I use os.path.dirname(dirsrv.dbdir) function. When it walks through dirs, it looks if it is not ['ldif', 'bak'], then it removes the dir. So it is not the case if ldif or bak were defined in another place.

To ssh://git.fedorahosted.org/git/389/ds.git
2c80c5c..4d448d3 master -> master
commit 4d448d3
Author: Simon Pichugin spichugi@redhat.com
Date: Mon Nov 7 21:01:56 2016 +0100

To ssh://git.fedorahosted.org/git/389/lib389.git
241d3e7..6ca8cd9 master -> master
commit 6ca8cd99ec55249052361a693a6b5cb9c1faa327
Author: Simon Pichugin spichugi@redhat.com
Date: Mon Nov 7 20:45:09 2016 +0100

attachment
0001-Ticket-49024-Fix-the-rest-of-the-CI-failures.patch

Change errors log paths to the ones from paths.py module.
The rest of the test cases, that failed on CI, passed for me on
the latest version of fedora 389-ds-base package built from master.

I will close the ticket when I see the stable CI run.

To ssh://git.fedorahosted.org/git/389/ds.git
9917640..cf11fae master -> master
commit cf11fae
Author: Simon Pichugin spichugi@redhat.com
Date: Wed Nov 9 10:10:51 2016 +0100

389-DS-NIGHTLY CI has come back to normal.

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This issue has been cloned to Github and is available here:
- https://github.com/389ds/389-ds-base/issues/2083

If you want to receive further updates on the issue, please navigate to the github issue
and click on subscribe button.

Thank you for understanding. We apologize for all inconvenience.