Skip to content

Commit

Permalink
Create role subdirectory
Browse files Browse the repository at this point in the history
Per Ansible Collection documentation,
the conjur_host_identity role
has been moved to a `role`
subdirectory. A `tests` subdirectory has been added
for this role, and all relevant tests moved there.
  • Loading branch information
BradleyBoutcher committed Sep 25, 2020
1 parent a768495 commit e182a0b
Show file tree
Hide file tree
Showing 64 changed files with 212 additions and 251 deletions.
23 changes: 11 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
# System directories files
.DS_Store
.idea/

# We don't care about test outputs
# Test output
tests/*/junit/
tests/*/conjur.pem
tests/*/access_token
**/test-files/output
junit

# We should never check in pycache directories
# Pycache directories and files
**/__pycache__/
.pytest_cache
*.pyc

# Distributable files should not be included in the repo
# Distributable directories files
*.tar.gz
vendor/

# ansible-conjur-host-identity
# Temporary files
*.log
.cache
*.retry
.idea/
*.pyc
**/.molecule/
**/test-files/output
junit
molecule/conjur.pem
*.tmp
vendor/
.pytest_cache
109 changes: 0 additions & 109 deletions .gitleaks.toml

This file was deleted.

12 changes: 3 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]

### Added
- The Ansible [conjur-host-identity](https://galaxy.ansible.com/cyberark/conjur-host-identity) has
been migrated to this collection, where it will be maintained moving forward. [cyberark/
conjur-host-identity#30](https://github.com/cyberark/ansible-conjur-host-identity/issues/30)

### Changed
- [Added retries](https://github.com/cyberark/ansible-conjur-host-identity/pull/32) to tasks/
identity/Request identity from Conjur.
This will increase the reliability of host factory requests without introducing any extra delay
if the first request succeeds.
- The [Conjur Ansible role](https://galaxy.ansible.com/cyberark/conjur-host-identity) has been
migrated to this collection, where it will be maintained moving forward.
[cyberark/ansible-conjur-host-identity#30](https://github.com/cyberark/ansible-conjur-host-identity/issues/30)

## [1.0.7] - 2020-08-20

Expand Down
10 changes: 8 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,15 @@ of this plugin:

### Testing

To run the tests:
To run a specific set of tests:

```sh-session
$ cd tests
$ ./test.sh <conjur or conjur-host-identity>
$ ./test.sh -d <role or plugin name>
```
To run all tests:

```sh-session
$ cd tests
$ ./test.sh -a
```
14 changes: 6 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@ pipeline {

stage('Run tests') {
parallel {
stage("Test Ansible-Conjur-Collection") {
agent { label 'executor-v2-large' }

stage("Test conjur_lookup Plugin") {
steps {
sh './ci/test.sh -d conjur'
junit 'tests/conjur/junit/*'
sh './ci/test.sh -d conjur_variable'
junit 'tests/conjur_variable/junit/*'
}
}

stage("Test Ansible-Conjur-Host-Identity") {
stage("Test conjur_host_identity Role") {
steps {
sh './ci/test.sh -d conjur-host-identity'
junit 'tests/conjur-host-identity/junit/*'
sh './ci/test.sh -d conjur_host_identity'
junit 'roles/conjur_host_identity/tests/junit/*'
}
}
}
Expand Down
Loading

0 comments on commit e182a0b

Please sign in to comment.