Merge branch 'master' into update-readme

Author: blag

.circle/configure-postgres.sh

@@ -1,5 +1,5 @@
 # Setup in CircleCI account the following ENV variables:
-# PACKAGECLOUD_ORGANIZATION (default: stackstorm)
+# PACKAGECLOUD_ORGANIZATION (default: stackstorm) 
 # PACKAGECLOUD_TOKEN
 version: 2
 jobs:
@@ -44,7 +44,7 @@ jobs:
   integration:
     docker:
       - image: circleci/python:2.7
-      - image: mongo:3.4
+      - image: mongo:4.0
       - image: rabbitmq:3
     working_directory: ~/st2
     steps:
@@ -57,8 +57,8 @@ jobs:
           name: Install Mongo Shell
           command: |
             set -x
-            sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
-            echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
+            sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
+            echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/4.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
             sudo apt-get -qq -y update
             sudo apt-get -qq -y install mongodb-org-shell
       - run:
@@ -80,7 +80,7 @@ jobs:
   lint:
     docker:
       - image: circleci/python:2.7
-      - image: mongo:3.4
+      - image: mongo:4.0
       - image: rabbitmq:3
     working_directory: ~/st2
     steps:

.circleci/config.yml

@@ -36,7 +36,7 @@ jobs:
     # If you rename or reorder make targets in TASK, you may need to adjust:
     # scripts/travis/install-requirements.sh
     # scripts/travis/run-nightly-make-task-if-exists.sh
-    - name: "Unit Tests (Python 2.7 MongoDB 3.4)"
+    - name: "Unit Tests (Python 2.7 MongoDB 4.0)"
       python: 2.7
       env: TASK=ci-unit CACHE_NAME=py2 COMMAND_THRESHOLD=700
 
@@ -59,11 +59,11 @@ jobs:
 addons:
   apt:
     sources:
-      - sourceline: 'deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse'
-        key_url: 'https://www.mongodb.org/static/pgp/server-3.4.asc'
+      - sourceline: 'deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.0 multiverse'
+        key_url: 'https://www.mongodb.org/static/pgp/server-4.0.asc'
     packages:
-      - mongodb-org-server=3.4.*
-      - mongodb-org-shell=3.4.*
+      - mongodb-org-server=4.0.*
+      - mongodb-org-shell=4.0.*
       - rabbitmq-server
       - libffi-dev
 
@@ -92,7 +92,7 @@ install:
 before_script:
   # Use a custom mongod.conf which uses various speed optimizations
   - sudo cp scripts/travis/mongod.conf /etc/mongod.conf
-  # Clean up any old MongoDB 3.4 data files laying around and make sure mongodb user can write to it
+  # Clean up any old MongoDB 4.0 data files laying around and make sure mongodb user can write to it
   - sudo rm -rf /var/lib/mongodb ; sudo mkdir /var/lib/mongodb ; sudo chown -R mongodb:mongodb /var/lib/mongodb
   - sudo service mongod restart ; sleep 5
   - sudo service mongod status

.travis.yml

@@ -31,6 +31,8 @@ Changed
   that does not exist. It now reports a simplified log for cleaner reading. Addresses and Fixes #4979. (improvement) #4981
 
   Contributed by Justin Sostre (@saucetray)
+* The built-in ``st2.action.file_writen`` trigger has been renamed to ``st2.action.file_written``
+  to fix the typo (bug fix) #4992
 
 Fixed
 ~~~~~
@@ -74,15 +76,12 @@ Fixed
 
   Contributed by @blag
 
-Changed
-~~~~~~~
-
-* The built-in ``st2.action.file_writen`` trigger has been renamed to ``st2.action.file_written``
-  to fix the typo (bug fix) #4992
-
 Removed
 ~~~~~~~
 
+* Removed ``Mistral`` workflow engine (deprecation) #5011
+
+  Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions)
 * Removed ``CentOS 6``/``RHEL 6`` support #4984
 
   Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions)

CHANGELOG.rst

@@ -22,10 +22,10 @@ BINARIES := bin
 # All components are prefixed by st2 and not .egg-info.
 COMPONENTS := $(shell ls -a | grep ^st2 | grep -v .egg-info)
 COMPONENTS_RUNNERS := $(wildcard contrib/runners/*)
+MOCK_RUNNERS := $(wildcard st2common/tests/runners/*)
 COMPONENTS_WITHOUT_ST2TESTS := $(shell ls -a | grep ^st2 | grep -v .egg-info | grep -v st2tests | grep -v st2exporter)
 
 COMPONENTS_WITH_RUNNERS := $(COMPONENTS) $(COMPONENTS_RUNNERS)
-COMPONENTS_WITH_RUNNERS_WITHOUT_MISTRAL_RUNNER := $(foreach component,$(filter-out contrib/runners/mistral_v2,$(COMPONENTS_WITH_RUNNERS)),$(component))
 
 COMPONENTS_TEST_DIRS := $(wildcard st2*/tests) $(wildcard contrib/runners/*/tests)
 
@@ -43,12 +43,11 @@ space_char :=
 space_char +=
 COMPONENT_PYTHONPATH = $(subst $(space_char),:,$(realpath $(COMPONENTS_WITH_RUNNERS)))
 COMPONENTS_TEST := $(foreach component,$(filter-out $(COMPONENT_SPECIFIC_TESTS),$(COMPONENTS_WITH_RUNNERS)),$(component))
-COMPONENTS_TEST_WITHOUT_MISTRAL_RUNNER := $(foreach component,$(filter-out $(COMPONENT_SPECIFIC_TESTS),$(COMPONENTS_WITH_RUNNERS_WITHOUT_MISTRAL_RUNNER)),$(component))
 COMPONENTS_TEST_COMMA := $(subst $(slash),$(dot),$(subst $(space_char),$(comma),$(COMPONENTS_TEST)))
 COMPONENTS_TEST_MODULES := $(subst $(slash),$(dot),$(COMPONENTS_TEST_DIRS))
 COMPONENTS_TEST_MODULES_COMMA := $(subst $(space_char),$(comma),$(COMPONENTS_TEST_MODULES))
 
-COVERAGE_GLOBS := .coverage.unit.* .coverage.integration.* .coverage.mistral.*
+COVERAGE_GLOBS := .coverage.unit.* .coverage.integration.*
 COVERAGE_GLOBS_QUOTED := $(foreach glob,$(COVERAGE_GLOBS),'$(glob)')
 
 REQUIREMENTS := test-requirements.txt requirements.txt
@@ -114,8 +113,6 @@ play:
 	@echo
 	@echo COMPONENTS_WITH_RUNNERS=$(COMPONENTS_WITH_RUNNERS)
 	@echo
-	@echo COMPONENTS_WITH_RUNNERS_WITHOUT_MISTRAL_RUNNER=$(COMPONENTS_WITH_RUNNERS_WITHOUT_MISTRAL_RUNNER)
-	@echo
 	@echo COMPONENTS_TEST=$(COMPONENTS_TEST)
 	@echo
 	@echo COMPONENTS_TEST_COMMA=$(COMPONENTS_TEST_COMMA)
@@ -126,8 +123,6 @@ play:
 	@echo
 	@echo COMPONENTS_TEST_MODULES_COMMA=$(COMPONENTS_TEST_MODULES_COMMA)
 	@echo
-	@echo COMPONENTS_TEST_WITHOUT_MISTRAL_RUNNER=$(COMPONENTS_TEST_WITHOUT_MISTRAL_RUNNER)
-	@echo
 	@echo COMPONENT_PYTHONPATH=$(COMPONENT_PYTHONPATH)
 	@echo
 	@echo TRAVIS_PULL_REQUEST=$(TRAVIS_PULL_REQUEST)
@@ -163,6 +158,18 @@ install-runners:
 		(. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python setup.py develop --no-deps); \
 	done
 
+.PHONY: install-mock-runners
+install-mock-runners:
+	@echo ""
+	@echo "================== INSTALL MOCK RUNNERS ===================="
+	@echo ""
+	@for component in $(MOCK_RUNNERS); do \
+		echo "==========================================================="; \
+		echo "Installing mock runner:" $$component; \
+		echo "==========================================================="; \
+		(. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python setup.py develop --no-deps); \
+	done
+
 .PHONY: check-requirements
 .check-requirements:
 	@echo
@@ -455,16 +462,6 @@ compilepy3:
 	@mongo --eval "rs.initiate()"
 	@sleep 15
 
-.PHONY: .cleanmysql
-.cleanmysql:
-	@echo "==================== cleanmysql ===================="
-	@echo "----- Dropping all Mistral MYSQL databases -----"
-	@mysql -uroot -pStackStorm -e "DROP DATABASE IF EXISTS mistral"
-	@mysql -uroot -pStackStorm -e "CREATE DATABASE mistral"
-	@mysql -uroot -pStackStorm -e "GRANT ALL PRIVILEGES ON mistral.* TO 'mistral'@'127.0.0.1' IDENTIFIED BY 'StackStorm'"
-	@mysql -uroot -pStackStorm -e "FLUSH PRIVILEGES"
-	@/opt/openstack/mistral/.venv/bin/python /opt/openstack/mistral/tools/sync_db.py --config-file /etc/mistral/mistral.conf
-
 .PHONY: .cleanrabbitmq
 .cleanrabbitmq:
 	@echo "==================== cleanrabbitmq ===================="
@@ -479,7 +476,7 @@ compilepy3:
 	@echo "Removing all coverage results directories"
 	@echo
 	rm -rf .coverage $(COVERAGE_GLOBS) \
-		.coverage.unit .coverage.integration .coverage.mistral
+		.coverage.unit .coverage.integration
 
 .PHONY: distclean
 distclean: clean
@@ -524,7 +521,7 @@ distclean: clean
 	@echo "==========================================================="
 
 .PHONY: requirements
-requirements: virtualenv .requirements .sdist-requirements install-runners
+requirements: virtualenv .requirements .sdist-requirements install-runners install-mock-runners
 	@echo
 	@echo "==================== requirements ===================="
 	@echo
@@ -567,6 +564,12 @@ requirements: virtualenv .requirements .sdist-requirements install-runners
 	# make targets. This speeds up the build
 	(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
 
+	# Install st2auth to register SSO drivers
+	# NOTE: We pass --no-deps to the script so we don't install all the
+	# package dependencies which are already installed as part of "requirements"
+	# make targets. This speeds up the build
+	(cd ${ROOT_DIR}/st2auth; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
+
 	# Some of the tests rely on submodule so we need to make sure submodules are check out
 	git submodule update --recursive --remote
 
@@ -663,7 +666,7 @@ endif
 	@echo
 	@echo "----- Dropping st2-test db -----"
 	@mongo st2-test --eval "db.dropDatabase();"
-	for component in $(COMPONENTS_TEST_WITHOUT_MISTRAL_RUNNER); do\
+	for component in $(COMPONENTS_TEST); do\
 		echo "==========================================================="; \
 		echo "Running tests in" $$component; \
 		echo "-----------------------------------------------------------"; \
@@ -814,43 +817,8 @@ endif
 .PHONY: .itests-coverage-html
 .itests-coverage-html: .integration-tests-coverage-html
 
-.PHONY: mistral-itests
-mistral-itests: requirements .mistral-itests
-
-.PHONY: .mistral-itests
-.mistral-itests:
-	@echo
-	@echo "==================== MISTRAL integration tests ===================="
-	@echo "The tests assume both st2 and mistral are running on 127.0.0.1."
-	@echo
-	. $(VIRTUALENV_DIR)/bin/activate; nosetests $(NOSE_OPTS) -s -v st2tests/integration/mistral || exit 1;
-
-.PHONY: .run-mistral-itests-coverage
-ifdef INCLUDE_TESTS_IN_COVERAGE
-.run-mistral-itests-coverage: NOSE_COVERAGE_PACKAGES := $(NOSE_COVERAGE_PACKAGES),st2tests.mistral.integration
-endif
-.run-mistral-itests-coverage:
-	@echo
-	@echo "==================== MISTRAL integration tests with coverage ===================="
-	@echo "The tests assume both st2 and mistral are running on 127.0.0.1."
-	@echo
-	. $(VIRTUALENV_DIR)/bin/activate; \
-	    COVERAGE_FILE=.coverage.mistral.integration \
-	    nosetests $(NOSE_OPTS) -s -v $(NOSE_COVERAGE_FLAGS) \
-	    $(NOSE_COVERAGE_PACKAGES) \
-		st2tests/integration/mistral || exit 1;
-
-.coverage.mistral.integration:
-	if [ ! -e .coverage.mistral.integration ]; then \
-		make .run-mistral-itests-coverage; \
-	fi
-
-.PHONY: .mistral-itests-coverage-html
-.mistral-itests-coverage-html: .coverage.mistral.integration
-	. $(VIRTUALENV_DIR)/bin/activate; COVERAGE_FILE=.coverage.mistral.integration coverage html
-
 .PHONY: .coverage-combine
-.coverage-combine: .run-unit-tests-coverage .run-integration-tests-coverage .run-mistral-itests-coverage
+.coverage-combine: .run-unit-tests-coverage .run-integration-tests-coverage
 	. $(VIRTUALENV_DIR)/bin/activate; coverage combine $(COVERAGE_GLOBS)
 
 # This is a real target, but we need to do our own make trickery in case some
@@ -992,7 +960,7 @@ debs:
 
 
 .PHONY: ci
-ci: ci-checks ci-unit ci-integration ci-mistral ci-packs-tests
+ci: ci-checks ci-unit ci-integration ci-packs-tests
 
 .PHONY: ci-checks
 ci-checks: compile .generated-files-check .pylint .flake8 check-requirements check-sdist-requirements .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check .st2client-install-check check-python-packages
@@ -1011,13 +979,6 @@ ci-py3-packs-tests:
 	@echo
 	NOSE_WITH_TIMER=$(NOSE_WITH_TIMER) tox -e py36-packs -vv
 
-.PHONY: ci-py3-unit-nightly
-ci-py3-unit-nightly:
-	@echo
-	@echo "==================== ci-py3-unit ===================="
-	@echo
-	NOSE_WITH_TIMER=$(NOSE_WITH_TIMER) tox -e py36-unit-nightly -vv
-
 .PHONY: ci-py3-integration
 ci-py3-integration: requirements .ci-prepare-integration .ci-py3-integration
 
@@ -1067,15 +1028,6 @@ ci-py3-integration: requirements .ci-prepare-integration .ci-py3-integration
 .PHONY: ci-unit
 ci-unit: .unit-tests-coverage-html
 
-.PHONY: ci-unit-nightly
-ci-unit-nightly:
-	# NOTE: We run mistral runner checks only as part of a nightly build to speed up
-	# non nightly builds (Mistral will be deprecated in the future)
-	@echo
-	@echo "============== ci-unit-nightly =============="
-	@echo
-	. $(VIRTUALENV_DIR)/bin/activate; nosetests $(NOSE_OPTS) -s -v  contrib/runners/mistral_v2/tests/unit
-
 .PHONY: .ci-prepare-integration
 .ci-prepare-integration:
 	sudo -E ./scripts/travis/prepare-integration.sh
@@ -1086,13 +1038,6 @@ ci-integration: .ci-prepare-integration .itests-coverage-html
 .PHONY: ci-runners
 ci-runners: .ci-prepare-integration .runners-itests-coverage-html
 
-.PHONY: .ci-prepare-mistral
-.ci-prepare-mistral:
-	sudo -E ./scripts/travis/setup-mistral.sh
-
-.PHONY: ci-mistral
-ci-mistral: .ci-prepare-integration .ci-prepare-mistral .mistral-itests-coverage-html
-
 .PHONY: ci-orquesta
 ci-orquesta: .ci-prepare-integration .orquesta-itests-coverage-html
 

Makefile

@@ -12,8 +12,6 @@ This page lists active project maintainers and their areas of expertise. This ca
 Responsible for Project Strategy, External Relations, Organizational aspects, Partnerships and Future.
 * Dmitri Zimine ([@dzimine](https://github.com/dzimine/)) <<dzimine@stackstorm.com>>
   - StackStorm co-founder. External Relations, Leadership.
-* Lindsay Hill ([@LindsayHill](https://github.com/LindsayHill)) <<lindsay@stackstorm.com>>
-  - External Relations, Plans, Documentation, Community.
 
 # Senior Maintainers **
 ###### 2 vote points
@@ -32,9 +30,11 @@ Have deep platform knowledge & experience and demonstrate technical leadership a
 
 # Maintainers *
 ###### 1 vote points
-Being part of Technical Steering Committee (TSC) [@StackStorm/maintainers](https://github.com/orgs/StackStorm/teams/maintainers) provide significant and reliable value to the project helping it grow and improve through development and maintenance.
+Being part of Technical Steering Committee (TSC) [@StackStorm/maintainers](https://github.com/orgs/StackStorm/teams/maintainers) provide significant and reliable value to the project helping it grow and improve through development and maintenance. See [Maintainer Responsibilities](https://github.com/StackStorm/st2/blob/master/GOVERNANCE.md#maintainer-responsibilities) for more info.
+* Amanda McGuinness ([@amanda11](https://github.com/amanda11)) <<amanda.mcguinness@ammeonsolutions.com>>
+  - Ansible, Core, deb/rpm packages, CI/CD, Deployments, StackStorm Exchange, Documentation.
 * JP Bourget ([@punkrokk](https://github.com/punkrokk)) <<jp.bourget@gmail.com>>
-  - Systems, deb/rpm, Deployments, Community, StackStorm Exchange, SecOps, CircleCi
+  - Systems, deb/rpm, Deployments, Community, StackStorm Exchange, SecOps, CircleCI.
 * Mick McGrath ([@mickmcgrath13](https://github.com/mickmcgrath13)) <<mick@bitovi.com>>
   - Systems, ST2 Exchange. [Case Study](https://stackstorm.com/case-study-bitovi/).
 * Nick Maludy ([@nmaludy](https://github.com/nmaludy)) <<nmaludy@gmail.com>>
@@ -44,14 +44,15 @@ Being part of Technical Steering Committee (TSC) [@StackStorm/maintainers](https
 
 # Contributors
 Contributors are using and occasionally contributing back to the project, might be active in conversations or express their opinion on the project’s direction.
-They're not part of the TSC voting process, but appreciated for their contribution, involvement and may become Maintainers in future.
-<!-- [@StackStorm/contributors](https://github.com/orgs/StackStorm/teams/contributors) are invited to StackStorm Github organization and we appreciate their contribution and involvement. -->
-* Amanda McGuinness ([@amanda11](https://github.com/amanda11)) - StackStorm Exchange, Ansible, ChatOps, Documentation, core.
+They're not part of the TSC voting process, but appreciated for their contribution, involvement and may become Maintainers in the future depending on their effort and involvement. See [How to become a Maintainer?](https://github.com/StackStorm/st2/blob/master/GOVERNANCE.md#how-to-become-a-maintainer)
+[@StackStorm/contributors](https://github.com/orgs/StackStorm/teams/contributors) are invited to StackStorm Github organization and have permissions to help triage the Issues and review PRs.
+* AJ Jonen ([@guzzijones](https://github.com/guzzijones)) - ST2 Web UI, Orquesta, Core.
 * Carlos ([@nzlosh](https://github.com/nzlosh)) - Chatops, Errbot, Community, Discussions, StackStorm Exchange.
 * Hiroyasu Ohyama ([@userlocalhost](https://github.com/userlocalhost)) - Orquesta, Workflows, st2 Japan Community. [Case Study](https://stackstorm.com/case-study-dmm/).
 * Jon Middleton ([@jjm](https://github.com/jjm)) - StackStorm Exchange, Core, Discussions.
-* Tristan Struthers ([@trstruth](https://github.com/trstruth)) - Docker, K8s, Orquesta, Community.
 * Marcel Weinberg ([@winem](https://github.com/winem)) - Community, Docker, Core.
+* Sheshagiri Rao Mallipedhi ([@sheshagiri](https://github.com/sheshagiri)) - Docker, Core, StackStorm Exchange.
+* Tristan Struthers ([@trstruth](https://github.com/trstruth)) - Docker, K8s, Orquesta, Community.
 
 # Friends
 People that are currently not very active maintainers/contributors but who participated in and formed the project we have today.
@@ -72,6 +73,7 @@ Thank you, Friends!
 * Johan Dahlberg ([@johandahlberg](https://github.com/johandahlberg)) - Using st2 for Bioinformatics/Science project, providing feedback & contributions in Ansible, Community, Workflows. [Case Study](https://stackstorm.com/case-study-scilifelab/).
 * Johan Hermansson ([@johanherman](https://github.com/johanherman)) - Using st2 for Bioinformatics/Science project, feedback & contributions in Ansible, Community, Workflows. [Case Study](https://stackstorm.com/case-study-scilifelab/).
 * Lakshmi Kannan ([@lakshmi-kannan](https://github.com/lakshmi-kannan)) - early Stormer. Initial Core platform architecture, scalability, reliability, Team Leadership during the project hard times.
+* Lindsay Hill ([@LindsayHill](https://github.com/LindsayHill)) - ex StackStorm product manager that made a significant impact building an ecosystem we see today. 
 * Manas Kelshikar ([@manasdk](https://github.com/manasdk)) - ex Stormer. Developed (well) early core platform features.
 * Vineesh Jain ([@VineeshJain](https://github.com/VineeshJain)) - ex Stormer. Community, Tests, Core, QA.
 * Warren Van Winckel ([@warrenvw](https://github.com/warrenvw)) - ex Stormer. Docker, Kubernetes, Vagrant, Infrastructure.