The branch, master has been updated
via a7ad665e65f selftest/dbcheck: Fix up RODC one-way links (use
correct dbcheck rule)
via ce3d33f4c14 gitlab-ci: Do not download artifacts of unrelated builds
via 1cdf8493b5a gitlab-ci: Do not retry for job_execution_timeout
from 1d3e118f6f2 s3: smbspool. Remove last use of 'extern char
**environ;'.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a7ad665e65f0701eb75cac5bc10a366ccd9689f4
Author: Andrew Bartlett <[email protected]>
Date: Fri Oct 15 13:09:20 2021 +1300
selftest/dbcheck: Fix up RODC one-way links (use correct dbcheck rule)
The previous commit was correct on intention, but it was not noticed
as there is a race, that the incorrect rule was appended to.
These links are removed by remove_plausible_deleted_DN_links not
fix_all_old_dn_string_component_mismatch
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Joseph Sutton <[email protected]>
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Fri Oct 15 10:00:47 UTC 2021 on sn-devel-184
commit ce3d33f4c141afdfa3fbe9fe26835dc32ef95fe0
Author: Andrew Bartlett <[email protected]>
Date: Fri Oct 15 08:22:17 2021 +1300
gitlab-ci: Do not download artifacts of unrelated builds
This needs: is overridden in many cases, but ensures none of the other
main jobs start until this build finishes. However this also
ensures we do not download artifacts from any build unless we
specifically depend on it, saving bandwidth
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14863
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
commit 1cdf8493b5a43a084b5004e5c2667b9dd9e31d91
Author: Andrew Bartlett <[email protected]>
Date: Thu Oct 14 20:24:49 2021 +1300
gitlab-ci: Do not retry for job_execution_timeout
If we timeout, we should just stop at 2 hours, not waste 6 hours (3 x 2
hours).
This is for when the job runs long for any reason, currently the
reasons for a timeout are not transient, we need to either change
the timeout or fix the system. Likewise if the tests get into a loop
or deadlock we want to see that as a failure.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14863
Signed-off-by: Andrew Bartlett <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 12 +++++++++++-
testprogs/blackbox/dbcheck.sh | 4 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index d876923f9e7..f807eef41ce 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -97,6 +97,16 @@ include:
key: ccache.${CI_JOB_NAME}.${SAMBA_CI_JOB_IMAGE}.${SAMBA_CI_FLAVOR}
paths:
- ccache
+
+ # This is overridden in many cases, but ensures none of the other
+ # main jobs start until and unless this build finishes. However
+ # this also ensures we do not download artifacts from any build
+ # unless we specifically depend on it, saving bandwidth
+
+ needs:
+ - job: samba-def-build
+ artifacts: false
+
before_script:
- uname -a
- lsb_release -a
@@ -148,7 +158,6 @@ include:
- api_failure
- runner_unsupported
- stale_schedule
- - job_execution_timeout
- archived_failure
- scheduler_failure
- data_integrity_failure
@@ -177,6 +186,7 @@ others:
.shared_template_build_only:
extends: .shared_template
timeout: 2h
+ needs:
artifacts:
expire_in: 1 week
paths:
diff --git a/testprogs/blackbox/dbcheck.sh b/testprogs/blackbox/dbcheck.sh
index e2ba987e2de..5462441005e 100755
--- a/testprogs/blackbox/dbcheck.sh
+++ b/testprogs/blackbox/dbcheck.sh
@@ -19,12 +19,12 @@ dbcheck() {
# This list of attributes can be freely extended
dbcheck_fix_one_way_links() {
- $PYTHON $BINDIR/samba-tool dbcheck --quiet --fix --yes
fix_all_old_dn_string_component_mismatch --attrs="lastKnownParent
defaultObjectCategory fromServer rIDSetReferences msDS-RevealOnDemandGroup
msDS-NeverRevealGroup" --cross-ncs $ARGS
+ $PYTHON $BINDIR/samba-tool dbcheck --quiet --fix --yes
fix_all_old_dn_string_component_mismatch --attrs="lastKnownParent
defaultObjectCategory fromServer rIDSetReferences" --cross-ncs $ARGS
}
# This list of attributes can be freely extended
dbcheck_fix_stale_links() {
- $PYTHON $BINDIR/samba-tool dbcheck --quiet --fix --yes
remove_plausible_deleted_DN_links --attrs="member msDS-NC-Replica-Locations
msDS-NC-RO-Replica-Locations" --cross-ncs $ARGS
+ $PYTHON $BINDIR/samba-tool dbcheck --quiet --fix --yes
remove_plausible_deleted_DN_links --attrs="member msDS-NC-Replica-Locations
msDS-NC-RO-Replica-Locations msDS-RevealOnDemandGroup msDS-NeverRevealGroup"
--cross-ncs $ARGS
}
# This list of attributes can be freely extended
--
Samba Shared Repository
