1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

autobuild.py: Combine samba-static and samba-nopython

We expect these will complete in under an hour and reduce the number of
parallel jobs.  Hopefully there will be some ccache hits between these
as well.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2020-09-11 10:35:58 +12:00 committed by Douglas Bagnall
parent a9186829eb
commit 8557a52937
2 changed files with 23 additions and 25 deletions

View File

@ -133,7 +133,7 @@ samba:
samba-mitkrb5: samba-mitkrb5:
extends: .shared_template extends: .shared_template
samba-nopython: samba-minimal-smbd:
extends: .shared_template extends: .shared_template
samba-nopython-py2: samba-nopython-py2:
@ -160,9 +160,6 @@ samba-ad-dc-6:
samba-libs: samba-libs:
extends: .shared_template extends: .shared_template
samba-static:
extends: .shared_template
samba-fuzz: samba-fuzz:
extends: .shared_template extends: .shared_template
image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG} image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG}
@ -228,7 +225,6 @@ pages:
- others - others
- samba - samba
- samba-mitkrb5 - samba-mitkrb5
- samba-nopython
- samba-nopython-py2 - samba-nopython-py2
- samba-admem - samba-admem
- samba-ad-dc-2 - samba-ad-dc-2
@ -237,7 +233,7 @@ pages:
- samba-ad-dc-5 - samba-ad-dc-5
- samba-ad-dc-6 - samba-ad-dc-6
- samba-libs - samba-libs
- samba-static - samba-minimal-smbd
- samba-fuzz - samba-fuzz
# - ctdb # TODO # - ctdb # TODO
- samba-ctdb - samba-ctdb

View File

@ -644,8 +644,26 @@ tasks = {
("allshared-make", "make -j"), ("allshared-make", "make -j"),
], ],
"samba-static": [ "samba-fuzz": [
("random-sleep", random_sleep(1, 1)), # build the fuzzers (static) via the oss-fuzz script
("fuzzers-mkdir-prefix", "mkdir -p ${PREFIX_DIR}"),
("fuzzers-build", "OUT=${PREFIX_DIR} LIB_FUZZING_ENGINE= SANITIZER=address CXX= CFLAGS= ./lib/fuzzing/oss-fuzz/build_samba.sh --enable-afl"),
("fuzzers-check", "./lib/fuzzing/oss-fuzz/check_build.sh ${PREFIX_DIR}")
],
# * Test smbd and smbtorture can build semi-static
#
# * Test Samba without python still builds.
#
# When this test fails due to more use of Python, the expectations
# is that the newly failing part of the code should be disabled
# when --disable-python is set (rather than major work being done
# to support this environment).
#
# The target here is for vendors shipping a minimal smbd.
"samba-minimal-smbd": [
("random-sleep", random_sleep(300, 900)),
# build with all modules static # build with all modules static
("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL"), ("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL"),
("allstatic-make", "make -j"), ("allstatic-make", "make -j"),
@ -660,24 +678,8 @@ tasks = {
# retry with nonshared smbd and smbtorture # retry with nonshared smbd and smbtorture
("nonshared-distclean", "make distclean"), ("nonshared-distclean", "make distclean"),
("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"), ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=ALL --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd"),
("nonshared-make", "make -j") ("nonshared-make", "make -j"),
],
"samba-fuzz": [
# build the fuzzers (static) via the oss-fuzz script
("fuzzers-mkdir-prefix", "mkdir -p ${PREFIX_DIR}"),
("fuzzers-build", "OUT=${PREFIX_DIR} LIB_FUZZING_ENGINE= SANITIZER=address CXX= CFLAGS= ./lib/fuzzing/oss-fuzz/build_samba.sh --enable-afl"),
("fuzzers-check", "./lib/fuzzing/oss-fuzz/check_build.sh ${PREFIX_DIR}")
],
# Test Samba without python still builds. When this test fails
# due to more use of Python, the expectations is that the newly
# failing part of the code should be disabled when
# --disable-python is set (rather than major work being done to
# support this environment). The target here is for vendors
# shipping a minimal smbd.
"samba-nopython": [
("random-sleep", random_sleep(300, 900)),
("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"), ("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
("make", "make -j"), ("make", "make -j"),
("install", "make install"), ("install", "make install"),