ehlo,
attached is a simple patchwhich allows to run CI cript on CentOS. It worked just with a RHEL.
LS
On 09/29/2015 03:35 PM, Lukas Slebodnik wrote:
ehlo,
attached is a simple patchwhich allows to run CI cript on CentOS. It worked just with a RHEL.
LS
0001-CI-Fix-configure-script-arguments-for-CentOS.patch
From 04d67362c5b2ff19a828d8f69d3cb2fb978bba95 Mon Sep 17 00:00:00 2001 From: Lukas Slebodniklslebodn@redhat.com Date: Tue, 29 Sep 2015 12:04:31 +0200 Subject: [PATCH 1/4] CI: Fix configure script arguments for CentOS
Resolves: https://fedorahosted.org/sssd/ticket/2807
contrib/ci/configure.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh index d68f331913325463b698411efa61c2522f055ccf..fe37820bd99aba2d1f5bede9bc7e68fd601a53ab 100644 --- a/contrib/ci/configure.sh +++ b/contrib/ci/configure.sh @@ -31,7 +31,8 @@ declare -a CONFIGURE_ARG_LIST=( )
-if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- ]]; then +if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*-
|| "$DISTRO_BRANCH" == -redhat-centos-6.*- ]]; then CONFIGURE_ARG_LIST+=( "--disable-cifs-idmap-plugin" "--with-syslog=syslog"@@ -39,7 +40,8 @@ if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- ]]; then ) fi
-if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*- ]]; then +if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*-
|| "$DISTRO_BRANCH" == -redhat-centos-7.*- ]]; then CONFIGURE_ARG_LIST+=( "--without-python3-bindings" )-- 2.5.0
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that. If you prefer to have it otherwise, please change it everywhere.
Nick
On (29/09/15 15:47), Nikolai Kondrashov wrote:
On 09/29/2015 03:35 PM, Lukas Slebodnik wrote:
ehlo,
attached is a simple patchwhich allows to run CI cript on CentOS. It worked just with a RHEL.
LS
0001-CI-Fix-configure-script-arguments-for-CentOS.patch
From 04d67362c5b2ff19a828d8f69d3cb2fb978bba95 Mon Sep 17 00:00:00 2001 From: Lukas Slebodniklslebodn@redhat.com Date: Tue, 29 Sep 2015 12:04:31 +0200 Subject: [PATCH 1/4] CI: Fix configure script arguments for CentOS
Resolves: https://fedorahosted.org/sssd/ticket/2807
contrib/ci/configure.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh index d68f331913325463b698411efa61c2522f055ccf..fe37820bd99aba2d1f5bede9bc7e68fd601a53ab 100644 --- a/contrib/ci/configure.sh +++ b/contrib/ci/configure.sh @@ -31,7 +31,8 @@ declare -a CONFIGURE_ARG_LIST=( )
-if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- ]]; then +if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*-
|| "$DISTRO_BRANCH" == -redhat-centos-6.*- ]]; then@@ -39,7 +40,8 @@ if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- ]]; then ) fi
-if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*- ]]; then +if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-7.*-
|| "$DISTRO_BRANCH" == -redhat-centos-7.*- ]]; then-- 2.5.0
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
LS
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote:
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote:
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
IMO the || at the beginning is easier to spot (same as we use in C), so I would use it that way.
Michal
On (29/09/15 15:27), Michal Židek wrote:
On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote:
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
I was looking for "[[" in contrib script therefore I didn't find it. The "||" was used in little bit different way. make distcheck || status=$?
e.g. status=0 CK_FORK=no \ stage make-check-valgrind \ make-check-wrap -j $CPU_NUM check -- \ libtool --mode=execute \ valgrind-condense 99 \ '!(*.py|*dlopen-tests)' -- \ --trace-children=yes \ --trace-children-skip='*/bin/*,*/sbin/*' \ --leak-check=full \ --gen-suppressions=all \ --suppressions="$CI_DIR/sssd.supp" \ --verbose || status=$? mv "$test_dir" ci-test-dir ((status == 0))
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
IMO the || at the beginning is easier to spot (same as we use in C), so I would use it that way.
Michal, Nikaloi please decide which way is better. I don't mind any.
LS
On 09/29/2015 04:27 PM, Michal Židek wrote:
On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote:
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
IMO the || at the beginning is easier to spot (same as we use in C), so I would use it that way.
Personally, I consider such approach awkward and more confusing (and can argue endlessly :)), but if people prefer it this way, sure, let's change it.
Nick
On 09/29/2015 03:49 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:27 PM, Michal Židek wrote:
On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote:
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
IMO the || at the beginning is easier to spot (same as we use in C), so I would use it that way.
Personally, I consider such approach awkward and more confusing (and can argue endlessly :)), but if people prefer it this way, sure, let's change it.
Nick
So, I guess we came to conclusion that nothing needs to be changed in Lukas's patch, right? :D
Michal
On 09/29/2015 04:58 PM, Michal Židek wrote:
On 09/29/2015 03:49 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:27 PM, Michal Židek wrote:
On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote:
Thank you, Lukas. This is a simple and effective fix.
However, I would prefer that we keep the || on the end of the line, rather than the start of the next one. Simply because the rest of the CI code does that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
IMO the || at the beginning is easier to spot (same as we use in C), so I would use it that way.
Personally, I consider such approach awkward and more confusing (and can argue endlessly :)), but if people prefer it this way, sure, let's change it.
Nick
So, I guess we came to conclusion that nothing needs to be changed in Lukas's patch, right? :D
Er, no, I don't mind which way we go, but we'd better be consistent, so please either change Lukas's patch, or all the other places :)
Or, Lukas, did you mean that "||" outside []/[[]] tests is different and separate and we should have these changed only?
Nick
On (29/09/15 17:02), Nikolai Kondrashov wrote:
On 09/29/2015 04:58 PM, Michal Židek wrote:
On 09/29/2015 03:49 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:27 PM, Michal Židek wrote:
On 09/29/2015 03:20 PM, Nikolai Kondrashov wrote:
On 09/29/2015 04:03 PM, Lukas Slebodnik wrote:
On (29/09/15 15:47), Nikolai Kondrashov wrote: >Thank you, Lukas. This is a simple and effective fix. > >However, I would prefer that we keep the || on the end of the line, >rather >than the start of the next one. Simply because the rest of the CI >code does >that.
I tried to follow convention from other parts of CI script. However I could not find a multiline test. All tests in CI script are single line either "[[ sth ]]" or "[ sth ]". So I decided to use similar was as in C code.
Ah, I see.
>If you prefer to have it otherwise, please change it everywhere.
There's nothig to change or did I I overlook something? If you still prefer to have || on the end of the line then I can change it. Just let me know.
There are two cases of "||" at the end of the line in commands (not []/[[]] tests) in contrib/ci/run, plus there are two cases of "|" and one of "|&" in other places, which are not the same yet similar.
If it's all the same to you, I'd rather keep the convention.
Thank you.
Nick
IMO the || at the beginning is easier to spot (same as we use in C), so I would use it that way.
Personally, I consider such approach awkward and more confusing (and can argue endlessly :)), but if people prefer it this way, sure, let's change it.
Nick
So, I guess we came to conclusion that nothing needs to be changed in Lukas's patch, right? :D
Er, no, I don't mind which way we go, but we'd better be consistent, so please either change Lukas's patch, or all the other places :)
Or, Lukas, did you mean that "||" outside []/[[]] tests is different and separate and we should have these changed only?
yes, it's something different. It's hard to notice || outside of tests []/[[]].
But it's better to be consistent and || before next command outsde tests is more awkward and more confusing.
Updated patch is attached.
LS
On 09/30/2015 08:31 AM, Lukas Slebodnik wrote:
On (29/09/15 17:02), Nikolai Kondrashov wrote:
Er, no, I don't mind which way we go, but we'd better be consistent, so please either change Lukas's patch, or all the other places :)
Or, Lukas, did you mean that "||" outside []/[[]] tests is different and separate and we should have these changed only?
yes, it's something different. It's hard to notice || outside of tests []/[[]].
But it's better to be consistent and || before next command outsde tests is more awkward and more confusing.
Updated patch is attached.
Thank you, Lukas!
I don't have CentOS handy, so I haven't tested it, but I trust you did.
ACK.
Nick
On (30/09/15 11:02), Nikolai Kondrashov wrote:
On 09/30/2015 08:31 AM, Lukas Slebodnik wrote:
On (29/09/15 17:02), Nikolai Kondrashov wrote:
Er, no, I don't mind which way we go, but we'd better be consistent, so please either change Lukas's patch, or all the other places :)
Or, Lukas, did you mean that "||" outside []/[[]] tests is different and separate and we should have these changed only?
yes, it's something different. It's hard to notice || outside of tests []/[[]].
But it's better to be consistent and || before next command outsde tests is more awkward and more confusing.
Updated patch is attached.
Thank you, Lukas!
I don't have CentOS handy, so I haven't tested it, but I trust you did.
ACK.
master: * 09365a02c9ff68f16227b69a348511bb584060bc
LS
sssd-devel@lists.fedorahosted.org
-
Lukas Slebodnik -
Michal Židek -
Nikolai Kondrashov