Attempt to resolve #23 entirely without a json_query().

This commit is contained in:
Jeff Geerling
2020-02-13 15:47:24 -06:00
parent 15641b6323
commit a75593c36a
4 changed files with 1 additions and 58 deletions

View File

@@ -84,12 +84,5 @@ jobs:
mkdir -p /home/runner/.ansible
ln -s /home/runner/work/kubernetes /home/runner/.ansible/collections
# TODO: Once community.general is on public Galaxy, drop the -s.
- name: Install community.general role to get json_query filter.
run: |
cp tests/integration/targets/kubernetes/files/manifest-example/MANIFEST.json MANIFEST.json
pip install jmespath
ansible-galaxy collection install --no-deps -s https://sivel.eng.ansible.com/api community.general
- name: Run molecule default test scenario
run: molecule test

View File

@@ -262,15 +262,13 @@
reason: DeploymentPaused
register: pause_deploy
- debug: var=pause_deploy
- name: Check that paused deployment wait worked
assert:
that:
- condition.reason == "DeploymentPaused"
- condition.status == "Unknown"
vars:
condition: '{{ pause_deploy.result.status.conditions | community.general.json_query("[?type==`Progressing`]") | first }}'
condition: '{{ pause_deploy.result.status.conditions[1] }}'
- name: Add a service based on the deployment
k8s:

View File

@@ -1,43 +0,0 @@
{
"collection_info": {
"namespace": "community",
"name": "kubernetes",
"version": "1.0.0",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
"maxamillion (https://github.com/maxamillion)",
"jmontleon (https://github.com/jmontleon)",
"fabianvf (https://github.com/fabianvf)",
"willthames (https://github.com/willthames)",
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"readme": "README.md",
"tags": [
"kubernetes",
"k8s",
"cloud",
"infrastructure",
"openshift",
"okd",
"cluster"
],
"description": "Kubernetes Collection for Ansible.",
"license": [],
"license_file": "LICENSE",
"dependencies": {},
"repository": "https://github.com/ansible-collections/kubernetes",
"documentation": "",
"homepage": "",
"issues": "https://github.com/ansible-collections/kubernetes/issues"
},
"file_manifest_file": {
"name": "FILES.json",
"ftype": "file",
"chksum_type": "sha256",
"chksum_sha256": "38d130899a6e46be25cbde550675c62b55827a79c3cfe29dc43fecd8e1de7ef6",
"format": 1
},
"format": 1
}

View File

@@ -1,5 +0,0 @@
# MANIFEST.json README
This manifest file is used in the test environment to overcome a bug currently in Ansible core: https://github.com/ansible/ansible/issues/67399
Once that bug is fixed, this file can be removed, along with the `cp` command used in the CI GitHub Actions workflow for this repository.