In this refresh the PIP variable is renamed to PIP3 and the PYPI_PKGS variable disappears since we (currently) don't have any need for it. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- .gitlab-ci.yml | 2 +- ci/cirrus/build.yml | 2 +- ci/cirrus/freebsd-11.vars | 5 ++--- ci/cirrus/freebsd-12.vars | 5 ++--- ci/cirrus/freebsd-current.vars | 8 ++++++++ ci/cirrus/macos-1015.vars | 5 ++--- ci/cirrus/refresh | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 ci/cirrus/freebsd-current.vars diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b893b285b5..2171905f8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ stages: -e "s|[@]PKGS@|$PKGS|g" -e "s|[@]MAKE@|$MAKE|g" -e "s|[@]PYTHON@|$PYTHON|g" - -e "s|[@]PIP@|$PIP|g" + -e "s|[@]PIP3@|$PIP3|g" -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" <ci/cirrus/build.yml >ci/cirrus/$NAME.yml - cat ci/cirrus/$NAME.yml diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index dc1cccd135..3ca88b265b 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -13,7 +13,7 @@ env: build_task: install_script: - @INSTALL_COMMAND@ @PKGS@ - - @PIP@ install @PYPI_PKGS@ + - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi clone_script: - git clone --depth 100 "$CI_REPOSITORY_URL" . - git fetch origin "$CI_COMMIT_REF_NAME" diff --git a/ci/cirrus/freebsd-11.vars b/ci/cirrus/freebsd-11.vars index 7c29c6f899..5add0fb058 100644 --- a/ci/cirrus/freebsd-11.vars +++ b/ci/cirrus/freebsd-11.vars @@ -4,6 +4,5 @@ CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP='/usr/local/bin/pip-3.7' -PKGS='augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl' -PYPI_PKGS='meson==0.54.0' +PIP3='/usr/local/bin/pip-3.7' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 7c29c6f899..5add0fb058 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -4,6 +4,5 @@ CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP='/usr/local/bin/pip-3.7' -PKGS='augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl' -PYPI_PKGS='meson==0.54.0' +PIP3='/usr/local/bin/pip-3.7' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars new file mode 100644 index 0000000000..5add0fb058 --- /dev/null +++ b/ci/cirrus/freebsd-current.vars @@ -0,0 +1,8 @@ +PACKAGING_COMMAND='pkg' +CC='/usr/bin/clang' +CCACHE='/usr/local/bin/ccache' +MAKE='/usr/local/bin/gmake' +NINJA='/usr/local/bin/ninja' +PYTHON='/usr/local/bin/python3' +PIP3='/usr/local/bin/pip-3.7' +PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/macos-1015.vars b/ci/cirrus/macos-1015.vars index 7704d747df..c29b8b13b8 100644 --- a/ci/cirrus/macos-1015.vars +++ b/ci/cirrus/macos-1015.vars @@ -4,6 +4,5 @@ CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP='/usr/local/bin/pip3' -PKGS='augeas autoconf automake bash bash-completion ccache cpanminus cppi curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libiscsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make ncurses ninja perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yajl' -PYPI_PKGS='meson==0.54.0' +PIP3='/usr/local/bin/pip3' +PKGS='augeas bash-completion ccache cppi curl dbus diffutils dnsmasq docutils flake8 gettext git glib gnutls libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl' diff --git a/ci/cirrus/refresh b/ci/cirrus/refresh index 3a178909f8..63ca794134 100755 --- a/ci/cirrus/refresh +++ b/ci/cirrus/refresh @@ -14,7 +14,7 @@ then exit 1 fi -HOSTS=$($LCITOOL hosts | grep -E 'freebsd-12|macos') +HOSTS=$($LCITOOL hosts | grep -E 'freebsd|macos') for host in $HOSTS do -- 2.29.2