Skip to content

Commit

Permalink
NO-ISSUE: ensure ADDITIONAL_MANIFEST_DIR exists
Browse files Browse the repository at this point in the history
In Makefile, ensure ADDITIONAL_MANIFEST_DIR exists
before trying to move its content.

Needed for trying to resolve the issue in
e2e-metal-single-node-live-iso job[*]

```
mv /root/sno-additional-manifests/* /home/sno/sno-additional-manifests/
mv: cannot stat '/root/sno-additional-manifests/*': No such file or directory
make: *** [Makefile:280: deploy_ibip] Error 1
```

Note: could be related to openshift/release#39064

[*] https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_assisted-test-infra/2143/pull-ci-openshift-assisted-test-infra-master-e2e-metal-single-node-live-iso/1655682994788110336/build-log.txt
  • Loading branch information
danielerez committed May 9, 2023
1 parent 4228c2c commit 44ece06
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,10 @@ deploy_static_network_config_nodes:
.PHONY: deploy_ibip
deploy_ibip:
ifdef ADDITIONAL_MANIFEST_DIR
rm -rf ${INSTALL_MANIFEST_DIR}; mkdir ${INSTALL_MANIFESTS_DIR}
mv ${ADDITIONAL_MANIFEST_DIR}/* ${INSTALL_MANIFESTS_DIR}/
if [ -n "$(ls -A ${ADDITIONAL_MANIFEST_DIR})" ]; then
rm -rf ${INSTALL_MANIFEST_DIR}; mkdir ${INSTALL_MANIFESTS_DIR}
mv ${ADDITIONAL_MANIFEST_DIR}/* ${INSTALL_MANIFESTS_DIR}/
fi
endif
# To deploy with a worker node, set TEST_FUNC=test_bip_add_worker
ifdef BIP_BUTANE_CONFIG
Expand Down

0 comments on commit 44ece06

Please sign in to comment.