Skip to content

Commit 7cbedc2

Browse files
committed
Allow passing extra args to kubectl-kuttl
Can now pass arbitary args while running test, for example to run a specific test can run:- make ovn_kuttl_run KUTTL_ARGS="--test ovn-config"
1 parent 3bb5b13 commit 7cbedc2

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

Makefile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ barbican_deploy: input barbican_deploy_prep ## installs the service instance usi
12211221

12221222
.PHONY: barbican_deploy_validate
12231223
barbican_deploy_validate: input namespace ## checks that barbican was properly deployed. Set BARBICAN_KUTTL_DIR to use assert file from custom repo.
1224-
kubectl-kuttl assert -n ${NAMESPACE} ${BARBICAN_KUTTL_DIR}/../common/assert_sample_deployment.yaml --timeout 180
1224+
kubectl-kuttl assert -n ${NAMESPACE} ${BARBICAN_KUTTL_DIR}/../common/assert_sample_deployment.yaml --timeout 180 $(KUTTL_ARGS)
12251225

12261226
.PHONY: barbican_deploy_cleanup
12271227
barbican_deploy_cleanup: ## cleans up the service instance, Does not affect the operator.
@@ -1720,7 +1720,7 @@ nova_deploy_cleanup: namespace ## cleans up the service instance, Does not affec
17201720

17211721
.PHONY: mariadb_kuttl_run
17221722
mariadb_kuttl_run: ## runs kuttl tests for the mariadb operator, assumes that everything needed for running the test was deployed beforehand.
1723-
kubectl-kuttl test --config ${MARIADB_KUTTL_CONF} ${MARIADB_KUTTL_DIR} --namespace ${NAMESPACE}
1723+
kubectl-kuttl test --config ${MARIADB_KUTTL_CONF} ${MARIADB_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
17241724

17251725
.PHONY: mariadb_kuttl
17261726
mariadb_kuttl: export NAMESPACE = ${MARIADB_KUTTL_NAMESPACE}
@@ -1747,7 +1747,7 @@ kuttl_common_cleanup: keystone_cleanup rabbitmq_cleanup kuttl_db_cleanup metallb
17471747

17481748
.PHONY: keystone_kuttl_run
17491749
keystone_kuttl_run: ## runs kuttl tests for the keystone operator, assumes that everything needed for running the test was deployed beforehand.
1750-
KEYSTONE_KUTTL_DIR=${KEYSTONE_KUTTL_DIR} kubectl-kuttl test --config ${KEYSTONE_KUTTL_CONF} ${KEYSTONE_KUTTL_DIR} --namespace ${NAMESPACE}
1750+
KEYSTONE_KUTTL_DIR=${KEYSTONE_KUTTL_DIR} kubectl-kuttl test --config ${KEYSTONE_KUTTL_CONF} ${KEYSTONE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
17511751

17521752
.PHONY: keystone_kuttl
17531753
keystone_kuttl: export NAMESPACE = ${KEYSTONE_KUTTL_NAMESPACE}
@@ -1766,7 +1766,7 @@ keystone_kuttl: kuttl_db_prep rabbitmq rabbitmq_deploy keystone keystone_deploy_
17661766

17671767
.PHONY: barbican_kuttl_run
17681768
barbican_kuttl_run: ## runs kuttl tests for the barbican operator, assumes that everything needed for running the test was deployed beforehand.
1769-
BARBICAN_KUTTL_DIR=${BARBICAN_KUTTL_DIR} kubectl-kuttl test --config ${BARBICAN_KUTTL_CONF} ${BARBICAN_KUTTL_DIR} --namespace ${NAMESPACE}
1769+
BARBICAN_KUTTL_DIR=${BARBICAN_KUTTL_DIR} kubectl-kuttl test --config ${BARBICAN_KUTTL_CONF} ${BARBICAN_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
17701770

17711771
.PHONY: barbican_kuttl
17721772
barbican_kuttl: export NAMESPACE = ${BARBICAN_KUTTL_NAMESPACE}
@@ -1781,7 +1781,7 @@ barbican_kuttl: kuttl_common_prep barbican barbican_deploy_prep ## runs kuttl te
17811781

17821782
.PHONY: placement_kuttl_run
17831783
placement_kuttl_run: ## runs kuttl tests for the placement operator, assumes that everything needed for running the test was deployed beforehand.
1784-
PLACEMENT_KUTTL_DIR=${PLACEMENT_KUTTL_DIR} kubectl-kuttl test --config ${PLACEMENT_KUTTL_CONF} ${PLACEMENT_KUTTL_DIR} --namespace ${NAMESPACE}
1784+
PLACEMENT_KUTTL_DIR=${PLACEMENT_KUTTL_DIR} kubectl-kuttl test --config ${PLACEMENT_KUTTL_CONF} ${PLACEMENT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
17851785

17861786
.PHONY: placement_kuttl
17871787
placement_kuttl: export NAMESPACE = ${PLACEMENT_KUTTL_NAMESPACE}
@@ -1796,7 +1796,7 @@ placement_kuttl: kuttl_common_prep placement placement_deploy_prep ## runs kuttl
17961796

17971797
.PHONY: cinder_kuttl_run
17981798
cinder_kuttl_run: ## runs kuttl tests for the cinder operator, assumes that everything needed for running the test was deployed beforehand.
1799-
kubectl-kuttl test --config ${CINDER_KUTTL_CONF} ${CINDER_KUTTL_DIR} --namespace ${NAMESPACE}
1799+
kubectl-kuttl test --config ${CINDER_KUTTL_CONF} ${CINDER_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
18001800

18011801
.PHONY: cinder_kuttl
18021802
cinder_kuttl: export NAMESPACE = ${CINDER_KUTTL_NAMESPACE}
@@ -1811,7 +1811,7 @@ cinder_kuttl: kuttl_common_prep cinder cinder_deploy_prep ## runs kuttl tests fo
18111811

18121812
.PHONY: neutron_kuttl_run
18131813
neutron_kuttl_run: ## runs kuttl tests for the neutron operator, assumes that everything needed for running the test was deployed beforehand.
1814-
kubectl-kuttl test --config ${NEUTRON_KUTTL_CONF} ${NEUTRON_KUTTL_DIR} --namespace ${NAMESPACE}
1814+
kubectl-kuttl test --config ${NEUTRON_KUTTL_CONF} ${NEUTRON_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
18151815

18161816
.PHONY: neutron_kuttl
18171817
neutron_kuttl: export NAMESPACE = ${NEUTRON_KUTTL_NAMESPACE}
@@ -1827,7 +1827,7 @@ neutron_kuttl: kuttl_common_prep ovn ovn_deploy neutron neutron_deploy_prep ## r
18271827

18281828
.PHONY: octavia_kuttl_run
18291829
octavia_kuttl_run: ## runs kuttl tests for the octavia operator, assumes that everything needed for running the test was deployed beforehand.
1830-
kubectl-kuttl test --config ${OCTAVIA_KUTTL_CONF} ${OCTAVIA_KUTTL_DIR} --namespace ${NAMESPACE}
1830+
kubectl-kuttl test --config ${OCTAVIA_KUTTL_CONF} ${OCTAVIA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
18311831

18321832
.PHONY: octavia_kuttl
18331833
octavia_kuttl: export NAMESPACE = ${OCTAVIA_KUTTL_NAMESPACE}
@@ -1861,11 +1861,11 @@ designate_kuttl: kuttl_common_prep ovn ovn_deploy redis_deploy_prep designate de
18611861

18621862
.PHONY: designate_kuttl_run
18631863
designate_kuttl_run: ## runs kuttl tests for the designate operator, assumes that everything needed for running the test was deployed beforehand.
1864-
kubectl-kuttl test --config ${DESIGNATE_KUTTL_CONF} ${DESIGNATE_KUTTL_DIR} --namespace ${NAMESPACE}
1864+
kubectl-kuttl test --config ${DESIGNATE_KUTTL_CONF} ${DESIGNATE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
18651865

18661866
.PHONY: ovn_kuttl_run
18671867
ovn_kuttl_run: ## runs kuttl tests for the ovn operator, assumes that everything needed for running the test was deployed beforehand.
1868-
kubectl-kuttl test --config ${OVN_KUTTL_CONF} ${OVN_KUTTL_DIR} --namespace ${NAMESPACE}
1868+
kubectl-kuttl test --config ${OVN_KUTTL_CONF} ${OVN_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
18691869

18701870
.PHONY: ovn_kuttl
18711871
ovn_kuttl: export NAMESPACE = ${OVN_KUTTL_NAMESPACE}
@@ -1882,7 +1882,7 @@ ovn_kuttl: input deploy_cleanup infra ovn ovn_deploy_prep ## runs kuttl tests fo
18821882

18831883
.PHONY: infra_kuttl_run
18841884
infra_kuttl_run: ## runs kuttl tests for the infra operator, assumes that everything needed for running the test was deployed beforehand.
1885-
kubectl-kuttl test --config ${INFRA_KUTTL_CONF} ${INFRA_KUTTL_DIR} --namespace ${NAMESPACE}
1885+
kubectl-kuttl test --config ${INFRA_KUTTL_CONF} ${INFRA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
18861886

18871887
.PHONY: infra_kuttl
18881888
infra_kuttl: export NAMESPACE = ${INFRA_KUTTL_NAMESPACE}
@@ -1898,7 +1898,7 @@ infra_kuttl: input deploy_cleanup rabbitmq rabbitmq_deploy infra memcached_deplo
18981898

18991899
.PHONY: ironic_kuttl_run
19001900
ironic_kuttl_run: ## runs kuttl tests for the ironic operator, assumes that everything needed for running the test was deployed beforehand.
1901-
kubectl-kuttl test --config ${IRONIC_KUTTL_CONF} ${IRONIC_KUTTL_DIR} --namespace ${NAMESPACE}
1901+
kubectl-kuttl test --config ${IRONIC_KUTTL_CONF} ${IRONIC_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
19021902

19031903
.PHONY: ironic_kuttl
19041904
ironic_kuttl: export NAMESPACE = ${IRONIC_KUTTL_NAMESPACE}
@@ -1915,7 +1915,7 @@ ironic_kuttl_crc: crc_storage ironic_kuttl
19151915

19161916
.PHONY: heat_kuttl_run
19171917
heat_kuttl_run: ## runs kuttl tests for the heat operator, assumes that everything needed for running the test was deployed beforehand.
1918-
kubectl-kuttl test --config ${HEAT_KUTTL_CONF} ${HEAT_KUTTL_DIR} --namespace ${NAMESPACE}
1918+
kubectl-kuttl test --config ${HEAT_KUTTL_CONF} ${HEAT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
19191919

19201920
.PHONY: heat_kuttl
19211921
heat_kuttl: export NAMESPACE = ${HEAT_KUTTL_NAMESPACE}
@@ -1934,7 +1934,7 @@ heat_kuttl_crc: crc_storage heat_kuttl
19341934

19351935
.PHONY: ansibleee_kuttl_run
19361936
ansibleee_kuttl_run: ## runs kuttl tests for the openstack-ansibleee operator, assumes that everything needed for running the test was deployed beforehand.
1937-
kubectl-kuttl test --config ${ANSIBLEEE_KUTTL_CONF} ${ANSIBLEEE_KUTTL_DIR} --namespace ${NAMESPACE}
1937+
kubectl-kuttl test --config ${ANSIBLEEE_KUTTL_CONF} ${ANSIBLEEE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
19381938

19391939
.PHONY: ansibleee_kuttl_cleanup
19401940
ansibleee_kuttl_cleanup:
@@ -1961,7 +1961,7 @@ ansibleee_kuttl: input ansibleee_kuttl_prep ansibleee ## runs kuttl tests for th
19611961

19621962
.PHONY: glance_kuttl_run
19631963
glance_kuttl_run: ## runs kuttl tests for the glance operator, assumes that everything needed for running the test was deployed beforehand.
1964-
kubectl-kuttl test --config ${GLANCE_KUTTL_CONF} ${GLANCE_KUTTL_DIR} --namespace ${NAMESPACE}
1964+
kubectl-kuttl test --config ${GLANCE_KUTTL_CONF} ${GLANCE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
19651965

19661966
.PHONY: glance_kuttl
19671967
glance_kuttl: export NAMESPACE = ${GLANCE_KUTTL_NAMESPACE}
@@ -1978,7 +1978,7 @@ glance_kuttl: kuttl_common_prep swift swift_deploy glance glance_deploy_prep ##
19781978

19791979
.PHONY: manila_kuttl_run
19801980
manila_kuttl_run: ## runs kuttl tests for the manila operator,
1981-
kubectl-kuttl test --config ${MANILA_KUTTL_CONF} ${MANILA_KUTTL_DIR} --namespace ${NAMESPACE}
1981+
kubectl-kuttl test --config ${MANILA_KUTTL_CONF} ${MANILA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
19821982

19831983
.PHONY: manila_kuttl
19841984
manila_kuttl: export NAMESPACE = ${MANILA_KUTTL_NAMESPACE}
@@ -1995,7 +1995,7 @@ manila_kuttl: kuttl_common_prep ceph manila manila_deploy_prep ## runs kuttl tes
19951995

19961996
.PHONY: swift_kuttl_run
19971997
swift_kuttl_run: ## runs kuttl tests for the swift operator, assumes that everything needed for running the test was deployed beforehand.
1998-
kubectl-kuttl test --config ${SWIFT_KUTTL_CONF} ${SWIFT_KUTTL_DIR} --namespace ${NAMESPACE}
1998+
kubectl-kuttl test --config ${SWIFT_KUTTL_CONF} ${SWIFT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
19991999

20002000
.PHONY: swift_kuttl
20012001
swift_kuttl: export NAMESPACE = ${SWIFT_KUTTL_NAMESPACE}
@@ -2011,7 +2011,7 @@ swift_kuttl: kuttl_common_prep barbican barbican_deploy swift swift_deploy_prep
20112011

20122012
.PHONY: horizon_kuttl_run
20132013
horizon_kuttl_run: ## runs kuttl tests for the horizon operator, assumes that everything needed for running the test was deployed beforehand.
2014-
kubectl-kuttl test --config ${HORIZON_KUTTL_CONF} ${HORIZON_KUTTL_DIR} --config ${HORIZON_KUTTL_CONF} --namespace ${NAMESPACE}
2014+
kubectl-kuttl test --config ${HORIZON_KUTTL_CONF} ${HORIZON_KUTTL_DIR} --config ${HORIZON_KUTTL_CONF} --namespace ${NAMESPACE} $(KUTTL_ARGS)
20152015

20162016
.PHONY: horizon_kuttl
20172017
horizon_kuttl: export NAMESPACE = ${HORIZON_KUTTL_NAMESPACE}
@@ -2580,7 +2580,7 @@ telemetry_deploy_cleanup: ## cleans up the service instance, Does not affect the
25802580

25812581
.PHONY: telemetry_kuttl_run
25822582
telemetry_kuttl_run: ## runs kuttl tests for the telemetry operator, assumes that everything needed for running the test was deployed beforehand.
2583-
kubectl-kuttl test --config ${TELEMETRY_KUTTL_CONF} --namespace ${NAMESPACE}
2583+
kubectl-kuttl test --config ${TELEMETRY_KUTTL_CONF} --namespace ${NAMESPACE} $(KUTTL_ARGS)
25842584

25852585
.PHONY: telemetry_kuttl
25862586
telemetry_kuttl: export NAMESPACE = ${TELEMETRY_KUTTL_NAMESPACE}

0 commit comments

Comments
 (0)