diff --git a/.test_runner_config.yaml b/.test_runner_config.yaml index b527d8a2c..0c097994b 100644 --- a/.test_runner_config.yaml +++ b/.test_runner_config.yaml @@ -28,6 +28,7 @@ steps: builddep: - rm -rf /var/cache/dnf/* - "dnf makecache || :" + - dnf -y module enable nodejs:12 - dnf builddep -y ${builddep_opts} -D "with_wheels 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False - dnf install -y gdb - dnf update -y annobin diff --git a/freeipa.spec.in b/freeipa.spec.in index 3bdb498b6..59e062fa1 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -169,7 +169,7 @@ BuildRequires: libuuid-devel BuildRequires: libsss_idmap-devel BuildRequires: libsss_certmap-devel BuildRequires: libsss_nss_idmap-devel >= %{sssd_version} -BuildRequires: nodejs(abi) < 11 +BuildRequires: nodejs(abi) BuildRequires: uglify-js BuildRequires: libverto-devel BuildRequires: libunistring-devel diff --git a/ipatests/azure/Dockerfile.build-container b/ipatests/azure/Dockerfile.build-container index 31d2c41fb..71a9111fe 100644 --- a/ipatests/azure/Dockerfile.build-container +++ b/ipatests/azure/Dockerfile.build-container @@ -6,7 +6,6 @@ ADD dist /root RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \ && dnf update -y dnf \ && dnf install -y dnf-plugins-core sudo wget systemd firewalld nss-tools iptables \ - && dnf config-manager '*modular*' --set-disabled \ && sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf \ && dnf install -y /root/rpms/*.rpm \ && dnf clean all && rm -rf /root/rpms /root/srpms \ diff --git a/ipatests/azure/templates/prepare-build.yml b/ipatests/azure/templates/prepare-build.yml index 93fc8a273..71c4c6a14 100644 --- a/ipatests/azure/templates/prepare-build.yml +++ b/ipatests/azure/templates/prepare-build.yml @@ -9,15 +9,14 @@ steps: timeout = 8 retries = 20 EOF - echo 'Disable modular repositories' - sudo dnf config-manager '*modular*' --set-disabled echo "Fedora mirror metalink content:" for metalink in $(sudo dnf repolist -v |grep Repo-metalink | awk '{print $2}' ) ; do echo '###############' ; echo '####' ; echo $metalink ; echo '####' ; curl $metalink ; done echo "Fastestmirror results:" sudo cat /var/cache/dnf/fastestmirror.cache + sudo dnf -y module enable nodejs:12 sudo dnf makecache || : echo "Installing base development environment" - sudo dnf install -y gdb make autoconf rpm-build gettext-devel automake libtool 'nodejs(abi) < 11' docker python3-paramiko || : + sudo dnf install -y gdb make autoconf rpm-build gettext-devel automake libtool docker python3-paramiko python3-pyyaml || : echo "Installing FreeIPA development dependencies" sudo dnf builddep -y --skip-broken -D "with_wheels 1" -D "with_lint 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False || : displayName: Prepare build environment