Skip to content

delete queues for integration #6354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guzzijones wants to merge 26 commits into
base: master
Choose a base branch
from
Open

delete queues for integration #6354

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
62161c9
delete queues for integration
guzzijones Sep 17, 2025
f43270e
add ply to fix st2client
guzzijones Sep 17, 2025
af14d23
use pip install for st2client checking
guzzijones Sep 17, 2025
4399ed4
remove transient dep ply
guzzijones Sep 17, 2025
33331c2
explicitly install requirementst for st2client testing
guzzijones Sep 18, 2025
1aa8e1b
remove 3.8
guzzijones Sep 18, 2025
562e6ac
remove unused import
guzzijones Sep 18, 2025
ce7702c
update dist_utils remove py2 info
guzzijones Sep 18, 2025
089d46c
centralize rabbit client
guzzijones Sep 18, 2025
112a253
fix hash for rbac
guzzijones Sep 19, 2025
c07bcf4
bump cryptography
guzzijones Sep 19, 2025
94fffc2
update changelog
guzzijones Sep 19, 2025
685c44d
oslo
guzzijones Sep 19, 2025
4cc1cdd
update setuptools and pip
guzzijones Sep 22, 2025
6a64c17
py-modules
guzzijones Sep 22, 2025
00c308d
add pyproject.toml to st2client
guzzijones Sep 22, 2025
414ffc2
cur path for setuptools to detect dist_utils.py
guzzijones Sep 22, 2025
228a850
update st2client license
guzzijones Sep 22, 2025
e0eae17
pip install instead of setup.py devel
guzzijones Sep 22, 2025
212f498
remove st2client.egg-info
guzzijones Sep 22, 2025
1b47c2b
use pip3
guzzijones Sep 22, 2025
4e251dd
st2client already installed
guzzijones Sep 22, 2025
95e2aec
pip 25.0.1
guzzijones Sep 22, 2025
ac25112
update changelog
guzzijones Sep 22, 2025
0699098
test_wiring is faster now
guzzijones Sep 22, 2025
b7fe29d
st2client classifiers
guzzijones Sep 23, 2025
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ flake8: requirements .flake8

$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)"
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install -r requirements.txt

$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd ..
$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version
Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/action_chain_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/announcement_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/http_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/inquirer_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/local_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/noop_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/orquesta_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/python_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/remote_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions contrib/runners/winrm_runner/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions scripts/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2actions/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2api/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2auth/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2client/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2common/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2reactor/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
24 changes: 23 additions & 1 deletion st2reactor/tests/integration/test_sensor_watcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ def setUpClass(cls):
def setUp(self):
super().setUp()
# pre-condition: Make sure there is no test pollution
# Delete any leftover queues from previous failed test runs
self._delete_sensor_watcher_amqp_queues(queue_name="st2.sensor.watch.covfefe")

# Verify queues are deleted
sw_queues = self._get_sensor_watcher_amqp_queues(
queue_name="st2.sensor.watch.covfefe"
)
# TODO: Maybe just delete any leftover queues from previous failed test runs.
self.assertTrue(len(sw_queues) == 0)

def test_sensor_watch_queue_gets_deleted_on_stop(self):
Expand Down Expand Up @@ -82,3 +85,22 @@ def _list_amqp_queues():
def _get_sensor_watcher_amqp_queues(self, queue_name):
all_queues = self._list_amqp_queues()
return set([q_name for q_name in all_queues if queue_name in q_name])

def _delete_sensor_watcher_amqp_queues(self, queue_name):
"""
Delete all queues containing the specified queue_name pattern.

:param string queue_name: Pattern to match in queue names
:returns: None
"""
# Get all queues matching the pattern
queues_to_delete = self._get_sensor_watcher_amqp_queues(queue_name=queue_name)

if not queues_to_delete:
return

# Create a rabbit client and delete each queue
rabbit_client = Client("localhost:15672", "guest", "guest")
for queue in queues_to_delete:
# Use default vhost "/"
rabbit_client.delete_queue("/", queue)
7 changes: 1 addition & 6 deletions st2stream/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
7 changes: 1 addition & 6 deletions st2tests/dist_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@
# for subpackages.
# At the very least we can vendorize some of their code instead of reimplementing
# each piece of their code every time our parsing breaks.
PY3 = sys.version_info[0] == 3

if PY3:
text_type = str
else:
text_type = unicode # noqa # pylint: disable=E0602
text_type = str

GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"

Expand Down
Loading