Skip to content

Commit 52aea85

Browse files
authored
Fix lab execution: align robot template and CI pipeline (#62)
* Fix lab execution: robot template and CI pipeline
1 parent 856436b commit 52aea85

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
image: mtarking/nac-vxlan:24.0.1
2+
image: mtarking/nac-vxlan:0.5.1rc1
33
stages:
44
- validate
55
- deploy
@@ -28,7 +28,7 @@ validate:
2828
rules:
2929
- if: $CI_COMMIT_TAG == null
3030
script:
31-
- set -o pipefail && ansible-playbook -i inventory.yml ndfc_validate.yml |& tee validate_output.txt
31+
- set -o pipefail && ansible-playbook -i inventory.yaml validate.yaml |& tee validate_output.txt
3232
artifacts:
3333
paths:
3434
- validate_output.txt
@@ -42,7 +42,7 @@ deploy:
4242
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
4343
when: manual
4444
script:
45-
- set -o pipefail && ansible-playbook -i inventory.yml vxlan.yml |& tee deploy_output.txt
45+
- set -o pipefail && ansible-playbook -i inventory.yaml vxlan.yaml |& tee deploy_output.txt
4646

4747
test-integration:
4848
stage: test
@@ -53,7 +53,7 @@ test-integration:
5353
rules:
5454
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
5555
script:
56-
- set -o pipefail && iac-test -d ./host_vars/nac-ndfc1 -d ./group_vars/ndfc/defaults.yaml -t ./tests/templates -f ./tests/filters -o ./tests/results/ndfc |& tee test_output.txt
56+
- set -o pipefail && nac-test -d ./host_vars/nac-fabric1 -d ./group_vars/ndfc/defaults.yaml -t ./tests/templates -o ./tests/results/ndfc |& tee test_output.txt
5757
artifacts:
5858
when: always
5959
paths:

tests/templates/config/fabric/fabric.robot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ Verify Fabric {{ fabric }} Underlay BGP Parameters
7373
Should Be Equal Value Json String ${r.json()} $..BGP_AUTH_KEY_TYPE {{ vxlan.underlay.bgp.authentication_key_type | default(defaults.vxlan.underlay.bgp.authentication_key_type) }} msg=BGP_AUTH_KEY_TYPE
7474
Should Be Equal Value Json String ${r.json()} $..BGP_AUTH_KEY {{ vxlan.underlay.bgp.authentication_key | default(omit) }} msg=BGP_AUTH_KEY
7575
{% endif %}
76-
77-
{% if not (vxlan.global.ibgp.vpc.advertise_pip | default(defaults.vxlan.global.ibgp.vpc.advertise_pip) | bool) %}
76+
{% if not (vxlan.global.ibgp.vpc.advertise_pip
77+
| default(defaults.vxlan.global.ibgp.vpc.advertise_pip)) %}
7878
Should Be Equal Value Json String ${r.json()} $..ADVERTISE_PIP_ON_BORDER {{ vxlan.global.ibgp.vpc.advertise_pip_border_only | default(defaults.vxlan.global.ibgp.vpc.advertise_pip_border_only) | lower}} msg=ADVERTISE_PIP_ON_BORDER
7979
{% endif %}
8080
Should Be Equal Value Json String ${r.json()} $..VPC_DOMAIN_ID_RANGE {{ vxlan.global.ibgp.vpc.domain_id_range | default(defaults.vxlan.global.ibgp.vpc.domain_id_range) }} msg=VPC_DOMAIN_ID_RANGE

validate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# This is the main entry point playbook for calling the various
33
# roles in this collection.
4-
- hosts: nac-ndfc1
4+
- hosts: nac-fabric1
55
any_errors_fatal: true
66
gather_facts: false
77

0 commit comments

Comments
 (0)