Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .github/workflows/orquesta-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ jobs:
set -e
echo "Failed after ${MAX_ATTEMPTS} attempts, failing the job."
exit 1
- name: Upload StackStorm services Logs
#if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: logs
path: logs/
- name: Codecov
# NOTE: We only generate and submit coverage report for master and version branches and only when the build succeeds (default on GitHub Actions, this was not the case on Travis so we had to explicitly check success)
if: "${{ success() && env.ENABLE_COVERAGE == 'yes' }}"
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ Changed
* Update various dependencies to latest stable versions (``bcrypt``, ``appscheduler``, ``pytz``,
``python-dateutil``, ``psutil``, ``passlib``, ``gunicorn``, ``flex``, ``cryptography``.
``eventlet``, ``greenlet``, ``webob`` , ``mongoengine``, ``pymongo``, ``requests``,
``python-ldap``). #5215, https://github.com/StackStorm/st2-auth-ldap/pull/94
``pyyaml``, ``kombu``, ``amqp``, ``python-ldap``).

#5215, https://github.com/StackStorm/st2-auth-ldap/pull/94

Contributed by @Kami.

Expand Down
10 changes: 5 additions & 5 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Packages versions fixed for the whole st2 stack
# Note: amqp is used by kombu
amqp==2.5.2
amqp==5.0.6
apscheduler==3.7.0
# requests 2.23 requires chardet < 3.1.0
chardet<3.1.0
Expand All @@ -17,7 +17,7 @@ greenlet==1.0.0
gunicorn==20.1.0
jsonpath-rw==1.4.0
jsonschema==2.6.0
kombu==4.6.6
kombu==5.0.2
lockfile==0.12.2
mongoengine==0.23.0
networkx==1.11
Expand All @@ -36,7 +36,7 @@ python-editor==1.0.4
python-keyczar==0.716
pytz==2021.1
pywinrm==0.4.1
pyyaml==5.4
pyyaml==5.4.1
redis==3.5.3
requests[security]==2.25.1
retrying==1.3.3
Expand All @@ -60,11 +60,11 @@ zake==0.2.2
bcrypt==3.2.0
jinja2==2.11.3
mock==4.0.3
nose-timer==0.7.5
nose-timer==1.0.1
nose-parallel==0.4.0
psutil==5.8.0
python-dateutil==2.8.1
python-statsd==2.1.0
ujson==1.35
orjson==3.5.1
orjson==3.5.2
udatetime==0.0.16
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
RandomWords
amqp==2.5.2
amqp==5.0.6
apscheduler==3.7.0
argcomplete==1.12.2
bcrypt==3.2.0
Expand All @@ -27,15 +27,15 @@ importlib-metadata==3.10.1
jinja2==2.11.3
jsonpath-rw==1.4.0
jsonschema==2.6.0
kombu==4.6.6
kombu==5.0.2
lockfile==0.12.2
mock==4.0.3
mongoengine==0.23.0
networkx==1.11
nose
nose-parallel==0.4.0
nose-timer==0.7.5
orjson==3.5.1
nose-timer==1.0.1
orjson==3.5.2
oslo.config>=1.12.1,<1.13
oslo.utils<5.0,>=4.0.0
paramiko==2.7.2
Expand All @@ -52,7 +52,7 @@ python-json-logger
python-statsd==2.1.0
pytz==2021.1
pywinrm==0.4.1
pyyaml==5.4
pyyaml==5.4.1
redis==3.5.3
rednose
requests[security]==2.25.1
Expand Down
4 changes: 2 additions & 2 deletions st2actions/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ eventlet==0.30.2
git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
gitpython==2.1.15
jinja2==2.11.3
kombu==4.6.6
kombu==5.0.2
lockfile==0.12.2
oslo.config>=1.12.1,<1.13
oslo.utils<5.0,>=4.0.0
pyinotify==0.9.6; platform_system=="Linux"
python-dateutil==2.8.1
python-json-logger
pyyaml==5.4
pyyaml==5.4.1
requests[security]==2.25.1
six==1.13.0
2 changes: 1 addition & 1 deletion st2api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
eventlet==0.30.2
gunicorn==20.1.0
jsonschema==2.6.0
kombu==4.6.6
kombu==5.0.2
mongoengine==0.23.0
oslo.config>=1.12.1,<1.13
oslo.utils<5.0,>=4.0.0
Expand Down
4 changes: 2 additions & 2 deletions st2client/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ cryptography==3.4.7
importlib-metadata==3.10.1
jsonpath-rw==1.4.0
jsonschema==2.6.0
orjson==3.5.1
orjson==3.5.2
prettytable==2.1.0
prompt-toolkit==1.0.15
python-dateutil==2.8.1
python-editor==1.0.4
pytz==2021.1
pyyaml==5.4
pyyaml==5.4.1
requests[security]==2.25.1
six==1.13.0
sseclient-py==1.7
8 changes: 4 additions & 4 deletions st2common/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# If you want to update depdencies for a single component, modify the
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
amqp==2.5.2
amqp==5.0.6
apscheduler==3.7.0
chardet<3.1.0
cryptography==3.4.7
Expand All @@ -19,17 +19,17 @@ greenlet==1.0.0
jinja2==2.11.3
jsonpath-rw==1.4.0
jsonschema==2.6.0
kombu==4.6.6
kombu==5.0.2
lockfile==0.12.2
mongoengine==0.23.0
networkx==1.11
orjson==3.5.1
orjson==3.5.2
oslo.config>=1.12.1,<1.13
paramiko==2.7.2
pymongo==3.11.3
python-dateutil==2.8.1
python-statsd==2.1.0
pyyaml==5.4
pyyaml==5.4.1
redis==3.5.3
requests[security]==2.25.1
retrying==1.3.3
Expand Down
20 changes: 6 additions & 14 deletions st2common/tests/integration/test_rabbitmq_ssl_listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,16 @@ def test_non_ssl_connection_on_ssl_listener_port_failure(self):
connection.release()

def test_ssl_connection_on_ssl_listener_success(self):
# Using query param notation
urls = "amqp://guest:guest@127.0.0.1:5671/?ssl=true"
connection = transport_utils.get_connection(urls=urls)

try:
self.assertTrue(connection.connect())
self.assertTrue(connection.connected)
finally:
if connection:
connection.release()
ca_cert_path = os.path.join(CERTS_FIXTURES_PATH, "ca/ca_certificate_bundle.pem")

# Using messaging.ssl config option
cfg.CONF.set_override(name="ssl", override=True, group="messaging")

connection = transport_utils.get_connection(
urls="amqp://guest:guest@127.0.0.1:5671/"
cfg.CONF.set_override(
name="ssl_ca_certs", override=ca_cert_path, group="messaging"
)

urls = "amqp://guest:guest@127.0.0.1:5671/"
connection = transport_utils.get_connection(urls=urls)

try:
self.assertTrue(connection.connect())
self.assertTrue(connection.connected)
Expand Down
2 changes: 1 addition & 1 deletion st2exporter/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
eventlet==0.30.2
kombu==4.6.6
kombu==5.0.2
oslo.config>=1.12.1,<1.13
six==1.13.0
2 changes: 1 addition & 1 deletion st2reactor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apscheduler==3.7.0
eventlet==0.30.2
jsonpath-rw==1.4.0
jsonschema==2.6.0
kombu==4.6.6
kombu==5.0.2
oslo.config>=1.12.1,<1.13
python-dateutil==2.8.1
six==1.13.0
2 changes: 1 addition & 1 deletion st2stream/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
eventlet==0.30.2
gunicorn==20.1.0
jsonschema==2.6.0
kombu==4.6.6
kombu==5.0.2
mongoengine==0.23.0
oslo.config>=1.12.1,<1.13
oslo.utils<5.0,>=4.0.0
Expand Down
2 changes: 1 addition & 1 deletion st2tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RandomWords
mock==4.0.3
nose
nose-parallel==0.4.0
nose-timer==0.7.5
nose-timer==1.0.1
psutil==5.8.0
pyrabbit
rednose
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
coverage==4.5.2
pep8==1.7.1
st2flake8==0.1.0
astroid==2.5.2
astroid==2.5.3
pylint==2.7.4
pylint-plugin-utils>=0.4
black==20.8b1
Expand Down