summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2021-04-21 22:13:41 +0200
committerGitHub <noreply@github.com>2021-04-21 22:13:41 +0200
commit738132da956217ba3f048d2b6ef37df5b7ec6824 (patch)
treeda87e491aad62afa1fd4262ec9ef0b6c683e8ffa
parentUpdate docs on working on docs (#74201) (diff)
downloadansible-738132da956217ba3f048d2b6ef37df5b7ec6824.tar.xz
ansible-738132da956217ba3f048d2b6ef37df5b7ec6824.zip
[ansible-test] add freebsd/13.0 remote (#74328)
Change: - FreeBSD 13.0 was released on the 13th, add it to ansible-test. Test Plan: - ci_complete Signed-off-by: Rick Elrod <rick@elrod.me>
-rw-r--r--.azure-pipelines/azure-pipelines.yml8
-rw-r--r--changelogs/fragments/ansible-test-freebsd-13.yml2
-rwxr-xr-xtest/integration/targets/handlers/runme.sh8
-rw-r--r--test/integration/targets/setup_paramiko/install-FreeBSD-13-python-2.yml6
-rw-r--r--test/integration/targets/setup_paramiko/install-FreeBSD-13-python-3.yml3
-rw-r--r--test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-2.yml4
-rw-r--r--test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-3.yml4
-rw-r--r--test/lib/ansible_test/_data/completion/remote.txt1
8 files changed, 28 insertions, 8 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index fc2bb3875e..5deabd62b7 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -95,10 +95,10 @@ stages:
test: rhel/8.3@3.6
- name: RHEL 8.3 py38
test: rhel/8.3@3.8
- - name: FreeBSD 11.4
- test: freebsd/11.4
- name: FreeBSD 12.2
test: freebsd/12.2
+ - name: FreeBSD 13.0
+ test: freebsd/13.0
groups:
- 1
- 2
@@ -174,10 +174,10 @@ stages:
test: rhel/8.3@3.6
- name: RHEL 8.3 py38
test: rhel/8.3@3.8
- - name: FreeBSD 11.4
- test: freebsd/11.4
- name: FreeBSD 12.2
test: freebsd/12.2
+ - name: FreeBSD 13.0
+ test: freebsd/13.0
- stage: Incidental_Docker
displayName: Incidental Docker
dependsOn: []
diff --git a/changelogs/fragments/ansible-test-freebsd-13.yml b/changelogs/fragments/ansible-test-freebsd-13.yml
new file mode 100644
index 0000000000..bfba3909d0
--- /dev/null
+++ b/changelogs/fragments/ansible-test-freebsd-13.yml
@@ -0,0 +1,2 @@
+minor_changes:
+ - ansible-test - add freebsd/13.0 as a remote option.
diff --git a/test/integration/targets/handlers/runme.sh b/test/integration/targets/handlers/runme.sh
index cefa926b5f..17255de194 100755
--- a/test/integration/targets/handlers/runme.sh
+++ b/test/integration/targets/handlers/runme.sh
@@ -15,7 +15,7 @@ ansible-playbook from_handlers.yml -i inventory.handlers -v "$@" --tags scenario
ansible-playbook test_listening_handlers.yml -i inventory.handlers -v "$@"
[ "$(ansible-playbook test_handlers.yml -i inventory.handlers -v "$@" --tags scenario2 -l A \
-| grep -E -o 'RUNNING HANDLER \[test_handlers : .*?]')" = "RUNNING HANDLER [test_handlers : test handler]" ]
+| grep -E -o 'RUNNING HANDLER \[test_handlers : .*]')" = "RUNNING HANDLER [test_handlers : test handler]" ]
# Test forcing handlers using the linear and free strategy
for strategy in linear free; do
@@ -55,13 +55,13 @@ for strategy in linear free; do
done
[ "$(ansible-playbook test_handlers_include.yml -i ../../inventory -v "$@" --tags playbook_include_handlers \
-| grep -E -o 'RUNNING HANDLER \[.*?]')" = "RUNNING HANDLER [test handler]" ]
+| grep -E -o 'RUNNING HANDLER \[.*]')" = "RUNNING HANDLER [test handler]" ]
[ "$(ansible-playbook test_handlers_include.yml -i ../../inventory -v "$@" --tags role_include_handlers \
-| grep -E -o 'RUNNING HANDLER \[test_handlers_include : .*?]')" = "RUNNING HANDLER [test_handlers_include : test handler]" ]
+| grep -E -o 'RUNNING HANDLER \[test_handlers_include : .*]')" = "RUNNING HANDLER [test_handlers_include : test handler]" ]
[ "$(ansible-playbook test_handlers_include_role.yml -i ../../inventory -v "$@" \
-| grep -E -o 'RUNNING HANDLER \[test_handlers_include_role : .*?]')" = "RUNNING HANDLER [test_handlers_include_role : test handler]" ]
+| grep -E -o 'RUNNING HANDLER \[test_handlers_include_role : .*]')" = "RUNNING HANDLER [test_handlers_include_role : test handler]" ]
# Notify handler listen
ansible-playbook test_handlers_listen.yml -i inventory.handlers -v "$@"
diff --git a/test/integration/targets/setup_paramiko/install-FreeBSD-13-python-2.yml b/test/integration/targets/setup_paramiko/install-FreeBSD-13-python-2.yml
new file mode 100644
index 0000000000..95697465b8
--- /dev/null
+++ b/test/integration/targets/setup_paramiko/install-FreeBSD-13-python-2.yml
@@ -0,0 +1,6 @@
+- name: Setup remote constraints
+ include_tasks: setup-remote-constraints.yml
+- name: Install Paramiko for Python 2 on FreeBSD 13
+ pip: # no package in pkg, just use pip
+ name: paramiko
+ extra_args: "-c {{ remote_constraints }}"
diff --git a/test/integration/targets/setup_paramiko/install-FreeBSD-13-python-3.yml b/test/integration/targets/setup_paramiko/install-FreeBSD-13-python-3.yml
new file mode 100644
index 0000000000..68dd3a9b95
--- /dev/null
+++ b/test/integration/targets/setup_paramiko/install-FreeBSD-13-python-3.yml
@@ -0,0 +1,3 @@
+- name: Install Paramiko for Python 3 on FreeBSD 13.0
+ pkgng:
+ name: py37-paramiko
diff --git a/test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-2.yml b/test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-2.yml
new file mode 100644
index 0000000000..200569695f
--- /dev/null
+++ b/test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-2.yml
@@ -0,0 +1,4 @@
+- name: Uninstall Paramiko for Python 2 on FreeBSD 13
+ pip:
+ name: paramiko
+ state: absent
diff --git a/test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-3.yml b/test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-3.yml
new file mode 100644
index 0000000000..738e2c0b2c
--- /dev/null
+++ b/test/integration/targets/setup_paramiko/uninstall-FreeBSD-13-python-3.yml
@@ -0,0 +1,4 @@
+- name: Uninstall Paramiko for Python 3 on FreeBSD 13.0
+ pkgng:
+ name: py37-paramiko
+ state: absent
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index 482988b983..704da1f732 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -1,5 +1,6 @@
freebsd/11.4 python=2.7,3.7,3.8 python_dir=/usr/local/bin
freebsd/12.2 python=3.7,2.7,3.8 python_dir=/usr/local/bin
+freebsd/13.0 python=3.7,2.7,3.8,3.9 python_dir=/usr/local/bin
macos/11.1 python=3.9 python_dir=/usr/local/bin
rhel/7.9 python=2.7
rhel/8.3 python=3.6,3.8