Skip to content

Commit

Permalink
Run unit test only on PR
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamin-robertson committed Jun 24, 2024
1 parent 623dea3 commit a04d6c7
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/acceptance_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
name: "Acceptance Testing"

on:
push:
branches:
- "*"
pull_request:
branches:
- "main"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
name: "Lint testing"

on:
push:
pull_request:
branches:
- "*"
- "main"

jobs:
setup_matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
name: "Unit Testing"

on:
push:
pull_request:
branches:
- "*"
- "main"

jobs:
setup_matrix:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.

**Upgrade warning**

The following default parameters for passwords have been removed from the modules.
The following default parameters for passwords have been removed from the module.
- observium::db_password
- observium::rootdb_password
- observium::snmpv3_authpass
Expand All @@ -23,7 +23,7 @@ If you were relying on these defaults you will need to set them in your control
- Bumped module dependencies to later versions.
- Bumped PDK version to 3.2.0.
- Lint and other minor fixes.
- Added lint, unit and litmus tests within Github actions.
- Added lint, unit and litmus tests within Github actions pipeline.

Thanks to https://github.com/baile320 for their security recommendations for this release. :)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class { 'observium':
```

2. Via environment hiera. (Preferred as we can encrypt these values)
Within environment hiera place the values as shown.
Within environment hiera place the values like shown.
```
---
observium::db_password: "your_password_here"
Expand Down Expand Up @@ -185,7 +185,7 @@ RHEL 9 require the following yum repos for installation - these will be automati

- [EPEL][4]
- [OpenNMS common][5]
- [OpenNMS RHEL8][13]
- [OpenNMS RHEL9][13]
- [remi-modular][14] - note you will need to enable php8.2 after adding this repo
```
/bin/dnf module -y install php:remi-8.2
Expand Down
4 changes: 2 additions & 2 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* `observium::apache`: Class: observium::apache inherits observium Configure apache server with virtual host for observium
* `observium::config`: Class: observium::config Configure observium configuration files lint:ignore:140chars lint:ignore:arrow_alignment
* `observium::database_init`: Class: obversium Init the observium database after install. lint:ignore:140chars
* `observium::firewall`: Class: observium::firewall Manage UFW on ubuntu
* `observium::firewall`: Class: observium::firewall Manage iptables on ubuntu
* `observium::firewalld`: Class: observium::firewall Manages firewall and opens ports for observium
* `observium::install`: Class: observium::install Creates folder structure for Observium, and install from tar
* `observium::mariadb`: Class: observium::mariadb Install mysql or mariadb - OS dependant
Expand Down Expand Up @@ -203,7 +203,7 @@ Valid options - ['AES','DES']

Data type: `Array`

Array Snmp_agentaddress - default ['udp:127.0.0.1:161','udp6:[::1]:161']
An array of addresses, on which snmpd will listen for queries. - default ['udp:127.0.0.1:161','udp6:[::1]:161']

##### <a name="-observium--mib_locations"></a>`mib_locations`

Expand Down
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# Valid options - ['AES','DES']
#
# @param snmpd_agentaddress
# Array Snmp_agentaddress - default ['udp:127.0.0.1:161','udp6:[::1]:161']
# An array of addresses, on which snmpd will listen for queries. - default ['udp:127.0.0.1:161','udp6:[::1]:161']
#
# @param mib_locations
# Miblocations for observium to add to snmp.conf, default ['/opt/observium/mibs/rfc','/opt/observium/mibs/net-snmp']
Expand Down Expand Up @@ -177,7 +177,7 @@
Enum['SHA','MD5'] $snmpv3_authalgo,
String $snmpv3_cryptopass,
Enum['AES','DES'] $snmpv3_cryptoalgo,
Array $snmpd_agentaddress, # need to document if this stays in module
Array $snmpd_agentaddress,
Array $mib_locations,
Array $additional_mib_location = [],
Array $additional_snmp_conf_options = [],
Expand Down

0 comments on commit a04d6c7

Please sign in to comment.