Merge branch 'topic/okurth/ci-fix-iso-extra-config' into 'master'

ci: pass ksdata64 as a param to the harness

See merge request core-build/photon-os-installer!106

.gitlab-ci.yml

@@ -89,11 +89,12 @@ iso-poi-harness:
         - docker run --rm --privileged -v/dev:/dev -v$(pwd):/workdir ${POI_IMAGE_NAME} photon-iso-builder --config iso.yaml
         # create OVF that includes that ISO, and a blank hard disk
         # base64 encode the ks file, must have no new lines (-w0)
-        - docker run --rm -v$(pwd):/workdir ${POI_IMAGE_NAME} ova-compose -i iso_ova.yaml -o ${ISO_OVF} -m --param ksdata64=$(base64 -w0 < minimal_ks.yaml)
+        - KSDATA64=$(base64 -w0 < minimal_ks.yaml)
+        - docker run --rm -v$(pwd):/workdir ${POI_IMAGE_NAME} ova-compose -i iso_ova.yaml -o ${ISO_OVF} -m --param ksdata64=${KSDATA64}
         # clone the harness code
         - git clone --depth=1 https://:${POI_HARNESS_PULL_TOKEN}@${CI_SERVER_HOST}/photon/poi-harness.git
         # POI harness will deploy OVF on a VC and run tests
-        - pytest ./poi-harness/ci/pytest/ -rs --deploy --ovf ${ISO_OVF} --name ${VM_NAME} --vc_config ${VC_CONFIG_FILE} --ks_config minimal_ks.yaml --ova_config iso_ova.yaml
+        - pytest ./poi-harness/ci/pytest/ -rs --deploy --ovf ${ISO_OVF} --name ${VM_NAME} --vc_config ${VC_CONFIG_FILE} --ks_config minimal_ks.yaml --ova_config iso_ova.yaml --param ksdata64=${KSDATA64}
     after_script:
         # change ownerships for cleanup
         - cd examples/iso