Skip to content
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.

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

Support for Ubuntu 18.04 #269

Merged
merged 6 commits into from
Jul 27, 2020
Merged
Show file tree
Hide file tree
Changes from 4 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
8 changes: 8 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ vagrant up

Other distros:
```sh
vagrant up ubuntu18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are a few more places to update, eg supported platforms, manual instructions, and list of deployments need to update

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll investigate and make those changes.

vagrant up centos7
vagrant up centos8
```
Expand Down
4 changes: 4 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ VIRTUAL_MACHINES = {
:hostname => 'ansible-st2-ubuntu16',
:box => 'ubuntu/xenial64',
},
:ubuntu18 => {
arm4b marked this conversation as resolved.
Show resolved Hide resolved
:hostname => 'ansible-st2-ubuntu18',
:box => 'ubuntu/bionic64',
},
:centos7 => {
:hostname => 'ansible-st2-centos7',
:box => 'centos/7',
Expand Down
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.ewc/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.ewc_smoketests/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.mongodb/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.nginx/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.nodejs/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.rabbitmq/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2chatops/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2repo/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2web/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
6 changes: 4 additions & 2 deletions stackstorm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
arm4b marked this conversation as resolved.
Show resolved Hide resolved
- StackStorm.nginx
- StackStorm.st2web
- StackStorm.nodejs
Expand Down