Skip to content

Commit

Permalink
Drop Ubuntu 16.04 support; Trying 20.04
Browse files Browse the repository at this point in the history
An issue with the ntp recipe breaks the Ubuntu 16.04 build:

```
Ran /bin/systemctl --system restart apparmor returned 1
```

See https://travis-ci.org/github/sealuzh/cwb-chef-repo/builds/702873714

Maybe related to sous-chefs/ntp#177
  • Loading branch information
joe4dev committed Jun 28, 2020
1 parent e9db1c5 commit bde40a9
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
jobs:
- INSTANCE=ubuntu-1804
# Add on demand:
- INSTANCE=ubuntu-1604
- INSTANCE=ubuntu-2004

before_install:
- cd cookbooks/cwb-server
Expand Down
7 changes: 3 additions & 4 deletions cookbooks/cwb-server/.kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ driver:
- RUN locale-gen en_US.UTF-8

platforms:
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-16.04

- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04

transport:
name: dokken
Expand Down
4 changes: 2 additions & 2 deletions cookbooks/cwb-server/.kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ verifier:

platforms:
# Node attributes: cat /tmp/kitchen/nodes/default-ubuntu-1604.json
- name: ubuntu-16.04
- name: ubuntu-18.04
- name: ubuntu-18.04
- name: ubuntu-20.04

suites:
- name: default
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/cwb-server/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Configurable Variables
# Example: `make all_tests INSTANCE=ubuntu-1604`
# Example: `make all_tests INSTANCE=ubuntu-2004`
INSTANCE=default-ubuntu-1804
LOG_LEVEL=info # or debug

Expand Down
5 changes: 3 additions & 2 deletions cookbooks/cwb-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ Installs and configures the Cloud WorkBench server.

## Supported Platforms

* Ubuntu 18.04 64bit (tested 2019-01-02)
* Ubuntu 16.04 64bit (tested 2019-01-02)
* Ubuntu 18.04 64bit (manually tested 2019-01-02 and monthly tested through CI build)
* Ubuntu 20.04 64bit (monthly tested through CI build)
* NOTE: Ubuntu 16.04 fails due to a an [issue](https://github.com/chef-cookbooks/ntp/issues/177) with the ntp recipe

Ensure that the default locale `en_US.UTF-8` exists (e.g., install via `sudo locale-gen en_US.UTF-8`) or configure via the attribute `cwb-server.system.locale`

Expand Down

0 comments on commit bde40a9

Please sign in to comment.