Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 0 additions & 70 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,76 +21,6 @@ jobs:
id: matrix
run: ./contrib/ci/get-matrix.py --action

intgcheck:
if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'Accepted')
needs: [prepare]
strategy:
fail-fast: false
matrix:
tag: ${{ fromJson(needs.prepare.outputs.matrix).intgcheck }}
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
path: sssd

- name: Setup containers
uses: SSSD/sssd-ci-containers/actions/setup@master
with:
path: sssd-ci-containers
tag: ${{ matrix.tag }}
limit: dns client
override: |
services:
client:
image: ${REGISTRY}/ci-client-devel:${TAG}
volumes:
- ../sssd:/sssd:rw

- name: Run integration tests
uses: SSSD/sssd-ci-containers/actions/exec@master
with:
working-directory: /sssd
script: ./contrib/ci/run --moderate

- name: Print logs
uses: next-actions/print-logs@master
if: always()
with:
working-directory: ./sssd/ci-build-debug
files: |
test-suite.log
ci-make-intgcheck.log
ci-make-distcheck.log

- name: Upload main artifacts
if: always()
uses: actions/upload-artifact@v7
with:
if-no-files-found: ignore
name: ${{ matrix.tag }}-intgcheck
path: |
./sssd/var/log/sssd/*.log
./sssd/ci-build-debug/ci-*.log
./sssd/ci-build-debug/config.log
./sssd/ci-build-debug/test-suite.log
./sssd/ci-build-debug/ci-mock-result/*.log
./sssd/ci-build-debug/src/tests/cwrap/test-suite.log
./sssd/ci-install-deps.log
./sssd/ci-autoreconf.log

- name: Upload valgrind artifacts
if: always()
uses: actions/upload-artifact@v7
with:
if-no-files-found: ignore
name: ${{ matrix.tag }}-intgcheck-valgrind
path: |
./sssd/ci-build-debug/*.valgrind.log

system:
if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'Accepted')
needs: [prepare]
Expand Down
47 changes: 1 addition & 46 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if HAVE_MANPAGES
SUBDIRS += src/man
endif

SUBDIRS += . src/tests/cwrap src/tests/intg src/tests/test_CA \
SUBDIRS += . src/tests/cwrap src/tests/test_CA \
src/tests/test_ECC_CA src/tools/analyzer

# Some old versions of automake don't define builddir
Expand Down Expand Up @@ -4091,51 +4091,6 @@ test_sssd_krb5_localauth_plugin_LDADD = \
$(NULL)
endif

#####################
# Integration tests #
#####################

intgcheck-prepare:
set -e; \
rm -Rf intg; \
$(MKDIR_P) intg/bld; \
: Use /hopefully/ short prefix to keep D-Bus socket path short; \
prefix=`mktemp --tmpdir --directory sssd-intg.XXXXXXXX`; \
$(LN_S) "$$prefix" intg/pfx; \
cd intg/bld; \
$(abs_top_srcdir)/configure \
--prefix="$$prefix" \
--with-ldb-lib-dir="$$prefix"/lib/ldb \
--with-pid-path="$$prefix"/run/sssd \
--enable-intgcheck-reqs \
--without-selinux \
--with-session-recording-shell=/bin/false \
$(INTGCHECK_CONFIGURE_FLAGS) \
CFLAGS="-O2 -g $$CFLAGS -DINTGCHECK_BUILD"; \
$(MAKE) $(AM_MAKEFLAGS) ; \
$(MAKE) $(AM_MAKEFLAGS) test_ssh_client; \
: Force single-thread install to workaround concurrency issues; \
$(MAKE) $(AM_MAKEFLAGS) -j1 install; \
: Remove .la files from LDB module directory to avoid loader warnings; \
rm "$$prefix"/lib/ldb/*.la; \
cd ../..

intgcheck-run:
set -e; \
if [ ! -d intg/pfx ]; then $(MAKE) intgcheck-prepare; fi; \
cd intg/bld; \
$(MAKE) $(AM_MAKEFLAGS) -C src/tests/intg intgcheck-installed; \
cd ../..

intgcheck-clean:
set -e; \
prefix=`readlink -e intg/pfx`; \
rm -Rf "$$prefix" intg

intgcheck:
$(MAKE) intgcheck-prepare
$(MAKE) intgcheck-run
$(MAKE) intgcheck-clean

####################
# Client Libraries #
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ m4_include([src/external/sasl.m4])
m4_include([src/external/libnfsidmap.m4])
m4_include([src/external/cwrap.m4])
m4_include([src/external/libresolv.m4])
m4_include([src/external/intgcheck.m4])
m4_include([src/external/systemtap.m4])
m4_include([src/external/service.m4])
m4_include([src/external/test_ca.m4])
Expand Down Expand Up @@ -552,7 +551,7 @@ AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config
src/examples/logrotate
src/sysv/sssd src/sysv/gentoo/sssd src/sysv/gentoo/sssd-kcm
po/Makefile.in src/man/Makefile src/tests/cwrap/Makefile
src/tests/intg/Makefile src/tests/test_CA/Makefile
src/tests/test_CA/Makefile
src/tests/test_CA/intermediate_CA/Makefile
src/tests/test_ECC_CA/Makefile
src/lib/ipa_hbac/ipa_hbac.pc src/lib/ipa_hbac/ipa_hbac.doxy
Expand Down
4 changes: 0 additions & 4 deletions contrib/ci/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ declare -a DEPS_LIST=(
valgrind
)

# "Integration tests dependencies satisfied" flag
declare DEPS_INTGCHECK_SATISFIED=true

if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then
declare _DEPS_LIST_SPEC
DEPS_LIST+=(
Expand Down Expand Up @@ -150,7 +147,6 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
libsubid-dev
)

DEPS_INTGCHECK_SATISFIED=true
fi

declare -a -r DEPS_LIST
Expand Down
1 change: 0 additions & 1 deletion contrib/ci/get-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def get_centos_matrix():
centos = sorted(get_centos_matrix())

matrix = {
'intgcheck': [*fedora, *centos],
'multihost': [*fedora, *centos],
}

Expand Down
13 changes: 0 additions & 13 deletions contrib/ci/run
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ function build_debug()
declare -r valgrind_test_pattern+="*/double_semicolon_test)"
export CFLAGS="$DEBUG_CFLAGS"
declare test_dir
declare intgcheck_configure_args
declare status

test_dir=`mktemp --directory /dev/shm/ci-test-dir.XXXXXXXX`
Expand Down Expand Up @@ -163,18 +162,6 @@ function build_debug()
mv "$test_dir" ci-test-dir
((status == 0))

if "$MODERATE"; then
if "$DEPS_INTGCHECK_SATISFIED"; then
printf -v intgcheck_configure_args " %q" \
"${CONFIGURE_ARG_LIST[@]}"
stage make-intgcheck make -j $CPU_NUM intgcheck \
INTGCHECK_CONFIGURE_FLAGS=" \
$intgcheck_configure_args"
fi

((status == 0))
fi

unset CFLAGS
}

Expand Down
87 changes: 0 additions & 87 deletions src/external/intgcheck.m4

This file was deleted.

23 changes: 0 additions & 23 deletions src/tests/intg/.config/screenrc

This file was deleted.

Loading
Loading