From 75a85325fc7dbfbaa07a91ca981a66641f740081 Mon Sep 17 00:00:00 2001 From: Geoff Newson Date: Thu, 23 Jul 2020 22:35:09 +0100 Subject: [PATCH 1/6] Adding support for Ubuntu Bionic (18.04) --- Vagrantfile | 4 ++++ stackstorm.yml | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3038ab4e..feb4fcc0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,6 +6,10 @@ VIRTUAL_MACHINES = { :hostname => 'ansible-st2-ubuntu16', :box => 'ubuntu/xenial64', }, + :ubuntu18 => { + :hostname => 'ansible-st2-ubuntu18', + :box => 'ubuntu/bionic64', + }, :centos7 => { :hostname => 'ansible-st2-centos7', :box => 'centos/7', diff --git a/stackstorm.yml b/stackstorm.yml index f2958759..79ad7b16 100644 --- a/stackstorm.yml +++ b/stackstorm.yml @@ -6,11 +6,13 @@ - StackStorm.mongodb - StackStorm.rabbitmq - role: StackStorm.postgresql - when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') + when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') and + not (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '18') - StackStorm.st2repo - StackStorm.st2 - role: StackStorm.st2mistral - when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') + when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') and + not (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '18') - StackStorm.nginx - StackStorm.st2web - StackStorm.nodejs From 2235ba1432eebca31987d7c13c13456a76d944c8 Mon Sep 17 00:00:00 2001 From: Geoff Newson Date: Thu, 23 Jul 2020 22:43:05 +0100 Subject: [PATCH 2/6] Updating README with Ubuntu Bionic --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 656705ac..ce52c684 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ vagrant up Other distros: ```sh +vagrant up ubuntu18 vagrant up centos7 vagrant up centos8 ``` From 0c9a5fd1d30a7178ae211e6f64b3bd56acc772a0 Mon Sep 17 00:00:00 2001 From: Geoff Newson Date: Fri, 24 Jul 2020 15:54:55 +0100 Subject: [PATCH 3/6] Updating meta information in necessary roles with Ubuntu bionic --- meta/main.yml | 1 + roles/StackStorm.ewc/meta/main.yml | 1 + roles/StackStorm.ewc_smoketests/meta/main.yml | 1 + roles/StackStorm.mongodb/meta/main.yml | 1 + roles/StackStorm.nginx/meta/main.yml | 1 + roles/StackStorm.nodejs/meta/main.yml | 1 + roles/StackStorm.rabbitmq/meta/main.yml | 1 + roles/StackStorm.st2/meta/main.yml | 1 + roles/StackStorm.st2chatops/meta/main.yml | 1 + roles/StackStorm.st2repo/meta/main.yml | 1 + roles/StackStorm.st2web/meta/main.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index 39060726..55e0efaa 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,6 +16,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.ewc/meta/main.yml b/roles/StackStorm.ewc/meta/main.yml index a178116a..fa59154f 100644 --- a/roles/StackStorm.ewc/meta/main.yml +++ b/roles/StackStorm.ewc/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.ewc_smoketests/meta/main.yml b/roles/StackStorm.ewc_smoketests/meta/main.yml index e4aac7c3..2052740a 100644 --- a/roles/StackStorm.ewc_smoketests/meta/main.yml +++ b/roles/StackStorm.ewc_smoketests/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.mongodb/meta/main.yml b/roles/StackStorm.mongodb/meta/main.yml index 006e4900..a9e570ef 100644 --- a/roles/StackStorm.mongodb/meta/main.yml +++ b/roles/StackStorm.mongodb/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.nginx/meta/main.yml b/roles/StackStorm.nginx/meta/main.yml index 896b619d..84ba2a55 100644 --- a/roles/StackStorm.nginx/meta/main.yml +++ b/roles/StackStorm.nginx/meta/main.yml @@ -9,6 +9,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.nodejs/meta/main.yml b/roles/StackStorm.nodejs/meta/main.yml index 3dfc866c..351707bc 100644 --- a/roles/StackStorm.nodejs/meta/main.yml +++ b/roles/StackStorm.nodejs/meta/main.yml @@ -9,6 +9,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.rabbitmq/meta/main.yml b/roles/StackStorm.rabbitmq/meta/main.yml index 33cde51a..d72d176d 100644 --- a/roles/StackStorm.rabbitmq/meta/main.yml +++ b/roles/StackStorm.rabbitmq/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.st2/meta/main.yml b/roles/StackStorm.st2/meta/main.yml index 783ee0ef..73e4cfa4 100644 --- a/roles/StackStorm.st2/meta/main.yml +++ b/roles/StackStorm.st2/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.st2chatops/meta/main.yml b/roles/StackStorm.st2chatops/meta/main.yml index 21ced9c4..bdd58900 100644 --- a/roles/StackStorm.st2chatops/meta/main.yml +++ b/roles/StackStorm.st2chatops/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.st2repo/meta/main.yml b/roles/StackStorm.st2repo/meta/main.yml index 35fd9d00..0f8ebb26 100644 --- a/roles/StackStorm.st2repo/meta/main.yml +++ b/roles/StackStorm.st2repo/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: diff --git a/roles/StackStorm.st2web/meta/main.yml b/roles/StackStorm.st2web/meta/main.yml index 01e06e4b..fbc177c6 100644 --- a/roles/StackStorm.st2web/meta/main.yml +++ b/roles/StackStorm.st2web/meta/main.yml @@ -9,6 +9,7 @@ galaxy_info: platforms: - name: Ubuntu versions: + - bionic - xenial - name: EL versions: From 68de50daad5e9d23e72381b75d6979bd8fca64b7 Mon Sep 17 00:00:00 2001 From: Geoff Newson Date: Fri, 24 Jul 2020 16:34:31 +0100 Subject: [PATCH 4/6] Updates to CI/CD config following addition of Ubuntu bionic --- .kitchen.yml | 8 ++++++++ .travis.yml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.kitchen.yml b/.kitchen.yml index 52619ecc..2a8ac944 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -31,6 +31,14 @@ platforms: run_command: /sbin/init volume: - /sys/fs/cgroup:/sys/fs/cgroup:ro + # Ubuntu Bionic with Systemd + - name: ubuntu-18.04 + driver_config: + image: stackstorm/packagingtest:bionic-systemd + platform: ubuntu + run_command: /sbin/init + volume: + - /sys/fs/cgroup:/sys/fs/cgroup:ro # CentOS7 with Systemd - name: centos-7 driver_config: diff --git a/.travis.yml b/.travis.yml index ab085636..0fabe3fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,13 @@ branches: env: # default is stable repo - DISTRO=ubuntu-16 LICENSE='BWC_LICENSE_ENTERPRISE' + - DISTRO=ubuntu-18 LICENSE='BWC_LICENSE_ENTERPRISE' - DISTRO=centos-7 LICENSE='BWC_LICENSE_ENTERPRISE' - DISTRO=centos-8 LICENSE='BWC_LICENSE_ENTERPRISE' # StackStorm 'unstable' repo check - DISTRO=ubuntu-16 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE' + - DISTRO=ubuntu-18 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE' - DISTRO=centos-7 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE' - DISTRO=centos-8 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE' From b6d21ee6d658f91d85b1084770639cd4e5d9364c Mon Sep 17 00:00:00 2001 From: Geoff Newson Date: Sat, 25 Jul 2020 12:13:42 +0100 Subject: [PATCH 5/6] Making Ubuntu Bionic the default for the Vagrant box --- README.md | 11 +++++++---- Vagrantfile | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ce52c684..ae67c006 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,11 @@ Aka IFTTT orchestration for Ops. ## Supported platforms * Ubuntu Xenial (16.04) +* Ubuntu Bionic (18.04) * RHEL7 / CentOS7 * RHEL8 / CentOS8 -> If you're using the provided Vagrantfile, note that it uses Xenial by default. +> If you're using the provided Vagrantfile, note that it uses Bionic by default. > In order to access StackStorm Web UI, please don't forget to ensure that http/https ports are opened in your firewall system. @@ -100,6 +101,7 @@ There are a few requirements when developing on `ansible-st2`. These are the platforms we must support (must pass end-to-end testing): - Xenial +- Bionic - CentOS7 - CentOS8 - RHEL7 (via AWS) @@ -107,14 +109,14 @@ These are the platforms we must support (must pass end-to-end testing): Must also support Ansible Idempotence (Eg. Ansible-playbook re-run should end with the following results: `changed=0.*failed=0`) -For development purposes there is [Vagrantfile](Vagrantfile) available. The following command will setup ubuntu16 box (`ubuntu/xenial64`) by default: +For development purposes there is [Vagrantfile](Vagrantfile) available. The following command will setup ubuntu18 box (`ubuntu/bionic64`) by default: ```sh vagrant up ``` Other distros: ```sh -vagrant up ubuntu18 +vagrant up ubuntu16 vagrant up centos7 vagrant up centos8 ``` @@ -126,7 +128,8 @@ You might be interested in other methods to deploy StackStorm engine: * [Puppet Module](https://github.com/stackstorm/puppet-st2) * Manual Instructions - * [Ubuntu 16.04](https://docs.stackstorm.com/install/deb.html) + * [Ubuntu 16.04](https://docs.stackstorm.com/install/u16.html) + * [Ubuntu 18.04](https://docs.stackstorm.com/install/u18.html) * [RHEL8/CentOS8](https://docs.stackstorm.com/install/rhel8.html) * [RHEL7/CentOS7](https://docs.stackstorm.com/install/rhel7.html) diff --git a/Vagrantfile b/Vagrantfile index feb4fcc0..51e133f5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -27,7 +27,7 @@ Vagrant.configure(2) do |config| config.ssh.forward_agent = true VIRTUAL_MACHINES.each do |name, cfg| - config.vm.define name, autostart: (name == :ubuntu16) do |vm_config| + config.vm.define name, autostart: (name == :ubuntu18) do |vm_config| vm_config.vm.hostname = cfg[:hostname] vm_config.vm.box = cfg[:box] From c37098d6a2b783367a076197e5ad95e08a35cc57 Mon Sep 17 00:00:00 2001 From: Eugen C Date: Mon, 27 Jul 2020 14:33:34 +0100 Subject: [PATCH 6/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ae67c006..9d65ed68 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,8 @@ st2smoketests, you will need to disable proxy for localhost. There are a few requirements when developing on `ansible-st2`. These are the platforms we must support (must pass end-to-end testing): -- Xenial -- Bionic +- Ubuntu Xenial +- Ubuntu Bionic - CentOS7 - CentOS8 - RHEL7 (via AWS)