Skip to content

Commit

Permalink
implemented pull_config_yamls and updated updated test-devcontainer f…
Browse files Browse the repository at this point in the history
…eature to test feature (#113)

Co-authored-by: alexlianides <[email protected]>
  • Loading branch information
alexlianides and alexlianides authored Oct 8, 2024
1 parent 2adb85e commit 26568af
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 3 deletions.
19 changes: 19 additions & 0 deletions .devcontainer/artifacts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
config:
containerRegistries:
- url: ghcr.io
repositoryPrefix: microsoft/azure-orbital-space-sdk
push_enabled: true
pull_enabled: true
login_enabled: false
login_username_file: ${HOME}/.ssh/ghcr_username
login_password_file: ${HOME}/.ssh/ghcr_password
- url: testdoesnotexist.azurecr.io
push_enabled: false
pull_enabled: true
login_enabled: false
extraBuildArtifacts:
- file: testartifact.txt
directory: tmp/test
repository: test
tag: 0.11.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Microsoft Azure Orbital Space SDK - DevContainer Feature",
"id": "spacefx-dev",
"version": "0.10.0",
"version": "0.11.0",
"description": "Deploys the environmental configuration used for developing payload application and plugins within the Azure Orbital Framework",
"documentationURL": "https://github.com/microsoft/azure-orbital-space-sdk-setup",
"options": {
Expand Down
29 changes: 29 additions & 0 deletions .devcontainer/features/spacefx-dev/updateContent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,36 @@ function pull_config_yamls(){
info_log "START: ${FUNCNAME[0]}"


if [[ ${#ADDL_CONFIG_YAMLS[@]} -eq 0 ]]; then
info_log "...no additional yamls specified in devcontainer.json. Nothing to do"
info_log "END: ${FUNCNAME[0]}"
return
fi

for config_yaml in "${ADDL_CONFIG_YAMLS[@]}"; do
if [[ -z "${config_yaml}" ]]; then
continue
fi

# debug_log "Container Working Dir: ${CONTAINER_WORKING_DIR}"
# debug_log "Host Folder: ${HOST_FOLDER}"
# config_yaml=${config_yaml//$CONTAINER_WORKING_DIR/$HOST_FOLDER}

info_log "checking for ${config_yaml}"

if [[ ! -f "${config_yaml}" ]]; then
exit_with_error "Unable to find config yaml '${config_yaml}'. Please check your path and rebuild devcontainer. Path must be from devcontainer's perspective"
fi

info_log "...adding config yaml'${config_yaml}' to ${SPACEFX_DIR}/config..."

run_a_script "basename ${config_yaml}" config_yaml_filename

info_log "Copying '${config_yaml}' to '${SPACEFX_DIR}/config/${config_yaml_filename}'..."
run_a_script "cp ${config_yaml} ${SPACEFX_DIR}/config/${config_yaml_filename}"
info_log "...successfully copied '${config_yaml}' to '${SPACEFX_DIR}/config/${config_yaml_filename}'"

done


info_log "END: ${FUNCNAME[0]}"
Expand Down
5 changes: 3 additions & 2 deletions .devcontainer/test-feature/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0_test_do_not_use-nightly": {
"app_name": "spacesdk-setup",
"app_type": "none",
"extract_setup_files": "false"
"extract_setup_files": "false",
"addl_config_yamls":"/workspaces/azure-orbital-space-sdk-setup/.devcontainer/artifacts.yaml"
}
},
"hostRequirements": {
Expand Down Expand Up @@ -104,5 +105,5 @@
}
},
"remoteUser": "root",
"initializeCommand": "${localWorkspaceFolder}/.vscode/copy_to_spacedev.sh --output-dir ${localWorkspaceFolder}/.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup"
"initializeCommand": "bash ${localWorkspaceFolder}/.vscode/copy_to_spacedev.sh --output-dir ${localWorkspaceFolder}/.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup ; bash ${localWorkspaceFolder}/.vscode/copy_to_spacedev.sh"
}
7 changes: 7 additions & 0 deletions tests/dev_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ wait_for_namespace_to_provision --namespace coresvc
wait_for_namespace_to_provision --namespace hostsvc
wait_for_namespace_to_provision --namespace platformsvc

echo "Checking for artifacts.yaml in /var/spacedev/config..."
artifact_yaml="/var/spacedev/config/artifacts.yaml"
if [[ ! -f "${artifact_yaml}" ]]; then
echo "artifacts.yaml not found in /var/spacedev/config. Please ensure the file is present."
exit 1
fi

echo ""
echo ""
echo ""
Expand Down

0 comments on commit 26568af

Please sign in to comment.