Skip to content
Snippets Groups Projects
Unverified Commit a06b16f5 authored by Thomas Woerner's avatar Thomas Woerner Committed by GitHub
Browse files

Merge pull request #827 from rjeffman/ci_update_ansible 

Upstream CI updates.
parents 0297cbe9 796f8435
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
molecule/centos-8-build/molecule.yml deleted 100644 → 0
+ 0
− 19
View file @ 0297cbe9
---
driver:
name: docker
platforms:
- name: centos-8-build
image: "centos:centos8"
pre_build_image: true
hostname: ipaserver.test.local
dns_servers:
- 8.8.8.8
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
command: /usr/sbin/init
privileged: true
provisioner:
name: ansible
playbooks:
prepare: ../resources/playbooks/prepare-build.yml
prerun: false
molecule/centos-8/molecule.yml deleted 100644 → 0
+ 0
− 19
View file @ 0297cbe9
---
driver:
name: docker
platforms:
- name: centos-8
image: quay.io/ansible-freeipa/upstream-tests:centos-8
pre_build_image: true
hostname: ipaserver.test.local
dns_servers:
- 127.0.0.1
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
command: /usr/sbin/init
privileged: true
provisioner:
name: ansible
playbooks:
prepare: ../resources/playbooks/prepare.yml
prerun: false
molecule/default
+ 1
− 1
View file @ a06b16f5
centos-8
\ No newline at end of file
fedora-latest
\ No newline at end of file
tests/README.md
+ 6
− 4
View file @ a06b16f5
......@@ -92,19 +92,21 @@ pip install molecule[docker]>=3
Now you can start a test container using the following command:
```
molecule create -s centos-8
molecule create -s c8s
```
Note: Currently the containers available for running the tests are:
* fedora-latest
* centos-7
* centos-8
* c8s
* c9s
### Running the tests inside the container
To run the tests you will use pytest (works the same as for VMs).
```
RUN_TESTS_IN_DOCKER=1 IPA_SERVER_HOST=centos-8 pytest
RUN_TESTS_IN_DOCKER=1 IPA_SERVER_HOST=c8s pytest
```
### Cleaning up after tests
......@@ -112,7 +114,7 @@ RUN_TESTS_IN_DOCKER=1 IPA_SERVER_HOST=centos-8 pytest
After running the tests you should probably destroy the test container using:
```
molecule destroy -s centos-8
molecule destroy -s c8s
```
See [Running the tests](#running-the-tests) section for more information on available options.
......
tests/azure/azure-pipelines.yml
+ 8
− 19
View file @ a06b16f5
......@@ -9,55 +9,44 @@ stages:
# Fedora
- stage: FedoraLatest_Ansible_2_9
- stage: Fedora_Latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: ">=2.9,<2.10"
ansible_version: "-core >=2.12,<2.13"
# CentOS 9 Stream
- stage: c9s_Ansible_2_9
- stage: CentOS_9_Stream
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: ">=2.9,<2.10"
ansible_version: "-core >=2.12,<2.13"
# CentOS 8 Stream
- stage: c8s_Ansible_2_9
- stage: CentOS_8_Stream
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: ">=2.9,<2.10"
# # CentOS 8
#
# - stage: CentOS8_Ansible_2_9
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: centos-8
# ansible_version: ">=2.9,<2.10"
ansible_version: "-core >=2.12,<2.13"
# CentOS 7
- stage: CentOS7_Ansible_2_9
- stage: CentOS_7
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: ">=2.9,<2.10"
ansible_version: "-core >=2.12,<2.13"
tests/azure/build-containers.yml
+ 0
− 6
View file @ a06b16f5
......@@ -21,12 +21,6 @@ jobs:
container_name: centos-7
build_scenario_name: centos-7-build
# - template: templates/build_container.yml
# parameters:
# job_name_suffix: Centos8
# container_name: centos-8
# build_scenario_name: centos-8-build
- template: templates/build_container.yml
parameters:
job_name_suffix: C8S
......
tests/azure/nightly.yml
+ 52
− 54
View file @ a06b16f5
......@@ -34,23 +34,32 @@ stages:
scenario: fedora-latest
ansible_version: "-core >=2.11,<2.12"
- stage: FedoraLatest_Ansible_Core_2_12
# - stage: FedoraLatest_Ansible_Core_2_12
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: fedora-latest
# ansible_version: "-core >=2.12,<2.13"
- stage: FedoraLatest_Ansible_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.12,<2.13"
ansible_version: ""
- stage: FedoraLatest_Ansible_latest
- stage: FedoraLatest_Ansible_Core_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: ""
ansible_version: "-core"
# CentoOS 9 Stream
......@@ -72,23 +81,32 @@ stages:
scenario: c9s
ansible_version: "-core >=2.11,<2.12"
- stage: c9s_Ansible_Core_2_12
# - stage: c9s_Ansible_Core_2_12
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: c9s
# ansible_version: "-core >=2.12,<2.13"
- stage: c9s_Ansible_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: "-core >=2.12,<2.13"
ansible_version: ""
- stage: c9s_Ansible_latest
- stage: c9s_Ansible_Core_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: ""
ansible_version: "-core"
# CentOS 8 Stream
......@@ -110,61 +128,32 @@ stages:
scenario: c8s
ansible_version: "-core >=2.11,<2.12"
- stage: c8s_Ansible_Core_2_12
# - stage: c8s_Ansible_Core_2_12
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: c8s
# ansible_version: "-core >=2.12,<2.13"
- stage: c8s_Ansible_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: "-core >=2.12,<2.13"
ansible_version: ""
- stage: c8s_Ansible_latest
- stage: c8s_Ansible_Core_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: ""
# # CentOS 8
#
# - stage: CentOS8_Ansible_2_9
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: centos-8
# ansible_version: ">=2.9,<2.10"
#
# - stage: CentOS8_Ansible_Core_2_11
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: centos-8
# ansible_version: "-core >=2.11,<2.12"
#
# - stage: CentOS8_Ansible_Core_2_12
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: centos-8
# ansible_version: "-core >=2.12,<2.13"
#
# - stage: CentOS8_Ansible_latest
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: centos-8
# ansible_version: ""
ansible_version: "-core"
# CentOS 7
......@@ -186,20 +175,29 @@ stages:
scenario: centos-7
ansible_version: "-core >=2.11,<2.12"
- stage: CentOS7_Ansible_Core_2_12
# - stage: CentOS7_Ansible_Core_2_12
# dependsOn: []
# jobs:
# - template: templates/group_tests.yml
# parameters:
# build_number: $(Build.BuildNumber)
# scenario: centos-7
# ansible_version: "-core >=2.12,<2.13"
- stage: CentOS7_Ansible_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: "-core >=2.12,<2.13"
ansible_version: ""
- stage: CentOS7_Ansible_latest
- stage: CentOS7_Ansible_Core_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: ""
ansible_version: "-core"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment