From 3086633a3b59653315b099e2860d0a68bedfc0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Tue, 1 Feb 2022 18:04:22 +0100 Subject: [PATCH 1/3] Update CI from centos7 to centos stream8 --- .github/workflows/build.yaml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 35b7a230e..aa0e83834 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -265,29 +265,29 @@ jobs: shards: [ 2 ] include: - os: ubuntu-20.04 - container: 'centos' - containerTag: 7 + container: 'quay.io/centos/centos' + containerTag: stream8 runtimeCheck: OFF protonGitRef: main shard: 1 shards: 2 - os: ubuntu-20.04 - container: 'centos' - containerTag: 7 + container: 'quay.io/centos/centos' + containerTag: stream8 runtimeCheck: OFF protonGitRef: main shard: 2 shards: 2 - os: ubuntu-20.04 - container: 'centos' - containerTag: 7 + container: 'quay.io/centos/centos' + containerTag: stream8 runtimeCheck: OFF protonGitRef: 0.36.0 shard: 1 shards: 2 - os: ubuntu-20.04 - container: 'centos' - containerTag: 7 + container: 'quay.io/centos/centos' + containerTag: stream8 runtimeCheck: OFF protonGitRef: 0.36.0 shard: 2 @@ -349,15 +349,16 @@ jobs: with: path: 'skupper-router' - - name: Install EPEL (on CentOS 7) - if: ${{ matrix.container == 'centos' }} + - name: Enable additional package repositories for CentOS + if: ${{ matrix.container == 'quay.io/centos/centos' }} run: | - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + dnf -y install epel-release + dnf config-manager --set-enabled powertools - name: Install Linux build dependencies if: ${{ runner.os == 'Linux' }} run: | - yum install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-pip make libwebsockets-devel ccache libasan libubsan libtsan + dnf install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-pip make libwebsockets-devel ccache libasan libubsan libtsan - name: Install Python build dependencies run: python3 -m pip install setuptools wheel tox @@ -436,7 +437,7 @@ jobs: - name: Install Linux runtime/test dependencies if: ${{ runner.os == 'Linux' }} run: | - yum install -y curl + dnf install -y curl - name: Install Linux runtime/test dependencies (for sanitizers) if: ${{ matrix.runtimeCheck != 'OFF' }} From dfd76b5d4fda766c88aa2e4375bbc02163267192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Thu, 3 Feb 2022 10:21:10 +0100 Subject: [PATCH 2/3] Make TravisCI config eligible for the Partner Queue --- .travis.yml | 115 +--------------------------------------------------- 1 file changed, 2 insertions(+), 113 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c29793f9..7a1718985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,79 +20,15 @@ language: c cache: ccache os: linux -dist: xenial +dist: focal jobs: fast_finish: true allow_failures: - - os: osx + - arch: ppc64le - arch: arm64 - arch: s390x include: - - name: "apache-rat:check" - os: linux - env: [] - language: java - addons: - apt: - packages: [] - install: [] - before_script: [] - script: - - mvn apache-rat:check - before_cache: - - rm -rf $HOME/.m2/repository/org/apache/qpid/* - cache: - directories: - - $HOME/.m2/repository - after_script: - - cat target/rat.txt || true # prepending /usr/bin to PATH to avoid mismatched python interpreters in /opt - - name: "qdrouterd:Debug (gcc on xenial)" - os: linux - env: - - QPID_SYSTEM_TEST_TIMEOUT=300 - - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - - PATH="/usr/bin:$PATH" PROTON_VERSION=main BUILD_TYPE=Debug - - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan' - - name: "qdrouterd:Coverage" - os: linux - env: - - QPID_SYSTEM_TEST_TIMEOUT=300 - - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - - PATH="/usr/bin:$PATH" PROTON_VERSION=0.36.0 BUILD_TYPE=Coverage - - name: "qdrouterd:RelWithDebInfo+MemoryDebug (gcc on xenial)" - os: linux - env: - - QPID_SYSTEM_TEST_TIMEOUT=300 - - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - - PATH="/usr/bin:$PATH" PROTON_VERSION=0.36.0 BUILD_TYPE=RelWithDebInfo - - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG' - - name: "qdrouterd:RelWithDebInfo+MemoryDebug (clang on focal)" - os: linux - dist: focal - before_install: - - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add - - - sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' -y - - sudo apt-get update -q - - sudo apt-get install -y clang-13 llvm-13-dev - # Update pip, it may prevent issues later - - sudo apt-get install -y python3-pip - - python3 -m pip install --user --upgrade pip - - python3 -m pip install --user tox virtualenv - # Install quart, h2 to run the http2 tests. - - python3 -m pip install --user quart h2 - # DISPATCH-1883: Install selectors to run tcp echo server/client tools - - python3 -m pip install --user selectors - # Install grpcio and protobuf to run the grpc tests. - - python3 -m pip install --user grpcio protobuf - env: - - QPID_SYSTEM_TEST_TIMEOUT=300 - - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - - QPID_SYSTEM_TEST_SKIP_HTTP2_LARGE_IMAGE_UPLOAD_TEST=True - - CC=clang-13 - - CXX=clang++-13 - - PATH="/usr/bin:$PATH" PROTON_VERSION=0.36.0 BUILD_TYPE=RelWithDebInfo - - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG' - name: "qdrouterd:RelWithDebInfo+MemoryDebug (gcc on focal)" arch: s390x os: linux @@ -148,45 +84,6 @@ jobs: - QPID_SYSTEM_TEST_TIMEOUT=300 - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - PATH="/usr/bin:$PATH" PROTON_VERSION=0.36.0 - - name: "qdrouterd:TSAN" - os: linux - dist: focal - before_install: - # Update pip, it may prevent issues later - - sudo apt-get install -y python3-pip - - python3 -m pip install --user --upgrade pip - - python3 -m pip install --user tox virtualenv - # Install quart to run the http2 tests. - - python3 -m pip install --user quart - # DISPATCH-1883: Install selectors to run tcp echo server/client tools - - python3 -m pip install --user selectors - # Install grpcio and protobuf to run the grpc tests. - - python3 -m pip install --user grpcio protobuf - env: - - QPID_SYSTEM_TEST_TIMEOUT=300 - - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - - QPID_SYSTEM_TEST_SKIP_HTTP2_LARGE_IMAGE_UPLOAD_TEST=True - - PATH="/usr/bin:$PATH" PROTON_VERSION=0.36.0 - - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=tsan' - - name: "qdrouterd:RelWithDebInfo+MemoryDebug (clang on macOS)" - os: osx - osx_image: xcode11 - env: - - QPID_SYSTEM_TEST_TIMEOUT=300 - - QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST=True - - PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:$PATH" PROTON_VERSION=main - - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG -DQD_ENABLE_ASSERTIONS=ON -DDISPATCH_TEST_TIMEOUT=500' - # exclude tests that require raw_connection functionality; not available in libuv proactor - - DISPATCH_CTEST_EXTRA='-E system_tests_tcp_adaptor|system_tests_http1_adaptor|system_tests_http2|system_tests_grpc|system_tests_http1_over_tcp' - before_install: - - bash ./macports.sh - - export COLUMNS=80 - - yes | sudo port install cmake swig swig-python libuv jsoncpp libwebsockets nghttp2 cyrus-sasl2 pkgconfig python37 py37-pip - # set aliases for CMake's PythonInterp and PythonLibs to find MacPort's `python` on the path first - - sudo port select --set python python37 - - sudo port select --set python3 python37 - - python3 -m venv p3venv - - source p3venv/bin/activate addons: apt: @@ -198,18 +95,12 @@ addons: - sasl2-bin - swig - libnghttp2-dev - # documentation - - asciidoc - - asciidoctor - - dblatex # unit test requirement - tox # code coverage - lcov before_install: -# Install and use the latest Node.js LTS version -- nvm install "lts/*" # Install Python 3.6.8 # Travis by itself would activate a virtualenv; CMake < 3.15 deals badly with this - curl -sSf --retry 5 -o python-3.6.8.tar.bz2 https://storage.googleapis.com/travis-ci-language-archives/python/binaries/ubuntu/16.04/x86_64/python-3.6.8.tar.bz2 @@ -241,8 +132,6 @@ script: - pushd ../qpid-proton - echo $(echo "Current proton commit:") $(git rev-parse HEAD) "(${PROTON_VERSION})" - popd -# Workaround on macOS for PROTON-808 Binaries have their library locations stripped -- if [[ "${OSTYPE}" == "darwin"* ]]; then install_name_tool -add_rpath $PREFIX/lib/. $PREFIX/lib/proton/bindings/python/_cproton.so; fi - ctest --timeout 1200 -V ${DISPATCH_CTEST_EXTRA} && if [ "$BUILD_TYPE" = "Coverage" ]; then cmake --build . --target coverage; fi after_success: From 54cea44e86f1af3593582fc8ff3374e84756ca37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 23:58:59 +0000 Subject: [PATCH 3/3] Bump @patternfly/react-core from 4.147.0 to 4.192.15 in /console/react Bumps [@patternfly/react-core](https://github.com/patternfly/patternfly-react) from 4.147.0 to 4.192.15. - [Release notes](https://github.com/patternfly/patternfly-react/releases) - [Commits](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@4.147.0...@patternfly/react-core@4.192.15) --- updated-dependencies: - dependency-name: "@patternfly/react-core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- console/react/package-lock.json | 78 +++++++++++++++++++-------------- console/react/package.json | 2 +- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/console/react/package-lock.json b/console/react/package-lock.json index e14abd473..a496fdb2a 100644 --- a/console/react/package-lock.json +++ b/console/react/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@patternfly/patternfly": "^4.125.3", "@patternfly/react-charts": "^6.15.14", - "@patternfly/react-core": "^4.147.0", + "@patternfly/react-core": "^4.192.15", "@patternfly/react-icons": "^4.11.8", "@patternfly/react-styles": "^4.11.8", "@patternfly/react-table": "^4.29.37", @@ -2849,36 +2849,41 @@ } }, "node_modules/@patternfly/react-core": { - "version": "4.147.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.147.0.tgz", - "integrity": "sha512-t0GQvmN7vjSJHW9+kiQW2UOLKitNzvr9umNGG3H+gxO/XjgqqH2JmhitN+556gM1+tUYY78yam4wCTTg5P5jOA==", + "version": "4.192.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.192.15.tgz", + "integrity": "sha512-nYNhuWeRegZ89WY4OKa4bX06DYsEDCmNYDEq8Jp9CHPVm/6UzmPmWA/Y5MTbLPZN6w2i0cvLHf2wQVrHSzwVvg==", "dependencies": { - "@patternfly/react-icons": "^4.11.8", - "@patternfly/react-styles": "^4.11.8", - "@patternfly/react-tokens": "^4.12.9", + "@patternfly/react-icons": "^4.43.15", + "@patternfly/react-styles": "^4.42.15", + "@patternfly/react-tokens": "^4.44.15", "focus-trap": "6.2.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", - "tslib": "1.13.0" + "tslib": "^2.0.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0" } }, + "node_modules/@patternfly/react-core/node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, "node_modules/@patternfly/react-icons": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.11.8.tgz", - "integrity": "sha512-xcF0sDrUcuCLncodIqCb3Z9KomOOQjBRXm9m3qCzPMVoI702GbjFbujqoCZJUpcdmPsQzgp+nZGjBZIuRBbTAA==", + "version": "4.43.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.43.15.tgz", + "integrity": "sha512-b1fcPpIsQVJBGG1onpNTDiGqVJ60BVNy3qvzUu4Ea+lOwP83oIlhODtS792wx1B284a4wxP3uMc6uXCfdULD/w==", "peerDependencies": { "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0" } }, "node_modules/@patternfly/react-styles": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.11.8.tgz", - "integrity": "sha512-JSSBqZ6LvZxRdaNvezSRV7dIMK+hLc9lL1RTLCQDRZq2OllR6CDSh1OePsBa22jBWXmXwpL/z7anJsm3F59SMw==" + "version": "4.42.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.42.15.tgz", + "integrity": "sha512-7E6NmaB3b+OOAqIBlS7nJ74Plq+n76VVTH5zxCyUFkrbjo31TRArwLU2dlO/tZr77Z3MiUjGBcoLLEv0R6BZBg==" }, "node_modules/@patternfly/react-table": { "version": "4.29.37", @@ -2898,9 +2903,9 @@ } }, "node_modules/@patternfly/react-tokens": { - "version": "4.12.9", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.12.9.tgz", - "integrity": "sha512-9bf3v4Wt+j70DppkptAJfJqpztd2MFH/VzrBqzPjL4OBtyWNenRKcLeJhdZGRuT7ZGKLfd7z3s5/5ApK1bGGzQ==" + "version": "4.44.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.44.15.tgz", + "integrity": "sha512-Xp82baZURMISkvpNaWNu3w4cMfc2NIsDYh9K5QpVMQ94vphQrAd54UoO5NQI574+/QY2IPGKWadfvix8324J0Q==" }, "node_modules/@patternfly/react-topology": { "version": "4.9.42", @@ -26017,29 +26022,36 @@ } }, "@patternfly/react-core": { - "version": "4.147.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.147.0.tgz", - "integrity": "sha512-t0GQvmN7vjSJHW9+kiQW2UOLKitNzvr9umNGG3H+gxO/XjgqqH2JmhitN+556gM1+tUYY78yam4wCTTg5P5jOA==", + "version": "4.192.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.192.15.tgz", + "integrity": "sha512-nYNhuWeRegZ89WY4OKa4bX06DYsEDCmNYDEq8Jp9CHPVm/6UzmPmWA/Y5MTbLPZN6w2i0cvLHf2wQVrHSzwVvg==", "requires": { - "@patternfly/react-icons": "^4.11.8", - "@patternfly/react-styles": "^4.11.8", - "@patternfly/react-tokens": "^4.12.9", + "@patternfly/react-icons": "^4.43.15", + "@patternfly/react-styles": "^4.42.15", + "@patternfly/react-tokens": "^4.44.15", "focus-trap": "6.2.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", - "tslib": "1.13.0" + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } } }, "@patternfly/react-icons": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.11.8.tgz", - "integrity": "sha512-xcF0sDrUcuCLncodIqCb3Z9KomOOQjBRXm9m3qCzPMVoI702GbjFbujqoCZJUpcdmPsQzgp+nZGjBZIuRBbTAA==", + "version": "4.43.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.43.15.tgz", + "integrity": "sha512-b1fcPpIsQVJBGG1onpNTDiGqVJ60BVNy3qvzUu4Ea+lOwP83oIlhODtS792wx1B284a4wxP3uMc6uXCfdULD/w==", "requires": {} }, "@patternfly/react-styles": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.11.8.tgz", - "integrity": "sha512-JSSBqZ6LvZxRdaNvezSRV7dIMK+hLc9lL1RTLCQDRZq2OllR6CDSh1OePsBa22jBWXmXwpL/z7anJsm3F59SMw==" + "version": "4.42.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.42.15.tgz", + "integrity": "sha512-7E6NmaB3b+OOAqIBlS7nJ74Plq+n76VVTH5zxCyUFkrbjo31TRArwLU2dlO/tZr77Z3MiUjGBcoLLEv0R6BZBg==" }, "@patternfly/react-table": { "version": "4.29.37", @@ -26055,9 +26067,9 @@ } }, "@patternfly/react-tokens": { - "version": "4.12.9", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.12.9.tgz", - "integrity": "sha512-9bf3v4Wt+j70DppkptAJfJqpztd2MFH/VzrBqzPjL4OBtyWNenRKcLeJhdZGRuT7ZGKLfd7z3s5/5ApK1bGGzQ==" + "version": "4.44.15", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.44.15.tgz", + "integrity": "sha512-Xp82baZURMISkvpNaWNu3w4cMfc2NIsDYh9K5QpVMQ94vphQrAd54UoO5NQI574+/QY2IPGKWadfvix8324J0Q==" }, "@patternfly/react-topology": { "version": "4.9.42", diff --git a/console/react/package.json b/console/react/package.json index 0a0326e98..43b70d978 100644 --- a/console/react/package.json +++ b/console/react/package.json @@ -5,7 +5,7 @@ "dependencies": { "@patternfly/patternfly": "^4.125.3", "@patternfly/react-charts": "^6.15.14", - "@patternfly/react-core": "^4.147.0", + "@patternfly/react-core": "^4.192.15", "@patternfly/react-icons": "^4.11.8", "@patternfly/react-styles": "^4.11.8", "@patternfly/react-table": "^4.29.37",