Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.11.0 Nightly updates #111

Merged
merged 2 commits into from
Sep 9, 2024
Merged

0.11.0 Nightly updates #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
328252d
update devcontainer.json and workflows to reference @0.11.0-nightly, …
Sep 5, 2024
85c15ad
updated image calcuations
Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"spacefx-dev"
],
"features": {
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0": {
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0-nightly": {
"app_name": "spacesdk-setup",
"app_type": "none"
}
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/test-feature/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"spacefx-dev"
],
"features": {
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0_test_do_not_use": {
"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"
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/devcontainer-feature-build-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
push:
branches:
- main
- '[0-9]*.[0-9]*.[0-9]*-nightly'


env:
Expand All @@ -34,7 +35,7 @@ jobs:
- name: Display Ubuntu version
run: lsb_release -a

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
env_file: ./env/spacefx.env
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
Expand All @@ -55,6 +56,9 @@ jobs:
# Copy the scripts ino the entry point for the devcontainer feature
echo "Copying all files to /var/spacedev..."
./.vscode/copy_to_spacedev.sh --output-dir ./.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup

SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}"
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}-${SPACEFX_CHANNEL}"

echo "...Cleaning './.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup/chart/certs'..."
# Remove the certs that might've been generated
Expand All @@ -66,9 +70,10 @@ jobs:
echo "Building the devcontainer feature..."
devcontainer features package --force-clean-output-folder ./.devcontainer/features --output-folder ./output/spacefx-dev


# Push the devcontainer feature tarball to the registry
echo "Pushing the devcontainer feature tarball to the registry..."
oras push ${{ env.REGISTRY }}/${{ env.FEATURE }}:${SPACEFX_VERSION} \
oras push ${{ env.REGISTRY }}/${{ env.FEATURE }}:${SPACEFX_VERSION_CHANNEL_TAG} \
--config /dev/null:application/vnd.devcontainers \
--annotation org.opencontainers.image.source=https://github.com/microsoft/azure-orbital-space-sdk-setup \
${{ env.ARTIFACT_PATH }}:application/vnd.devcontainers.layer.v1+tar
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run-setup-tests-smb-on.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ jobs:
- name: Display Ubuntu version
run: lsb_release -a

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
env_file: ./env/spacefx.env
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
VER_DOCKER_MAX: ${{ inputs.VER_DOCKER_MAX }}

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/switch-smb@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/switch-smb@0.11.0-nightly
with:
REPO_DIR: "${PWD}"
VALUE: "true"
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Display Ubuntu version
run: lsb_release -a

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
env_file: ./env/spacefx.env
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-setup-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Display Ubuntu version
run: lsb_release -a

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
env_file: ./env/spacefx.env
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Display Ubuntu version
run: lsb_release -a

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
env_file: ./env/spacefx.env
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
Expand Down
20 changes: 13 additions & 7 deletions .github/workflows/spacefx-images-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- main
- '[0-9]*.[0-9]*.[0-9]*-nightly'

jobs:
build-spacefx-base-image-amd64:
Expand All @@ -14,13 +15,13 @@ jobs:
packages: write

steps:
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@0.11.0-nightly
with:
docker-file: /var/spacedev/build/spacesdk-base/Dockerfile.spacesdk-base
architecture: amd64
Expand All @@ -35,13 +36,13 @@ jobs:
packages: write

steps:
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}

- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@0.11.0-nightly
with:
docker-file: ./build/spacesdk-base/Dockerfile.spacesdk-base
architecture: arm64
Expand All @@ -57,7 +58,7 @@ jobs:
packages: write

steps:
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
Expand Down Expand Up @@ -106,7 +107,7 @@ jobs:
packages: write

steps:
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
Expand Down Expand Up @@ -155,7 +156,7 @@ jobs:
packages: write

steps:
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
with:
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
Expand All @@ -167,6 +168,9 @@ jobs:
echo "Sourcing environment variables..."
source ./env/spacefx.env

SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}"
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}-${SPACEFX_CHANNEL}"

# Build the SpaceSDK-Jetson-DeviceQuery Versions
CUDA_VERSIONS=("11.4" "12.2")
for i in "${!CUDA_VERSIONS[@]}"; do
Expand All @@ -178,6 +182,7 @@ jobs:
--repo-dir ${PWD} \
--no-spacefx-dev \
--app-name spacesdk-jetson-devicequery \
--build-arg SDK_VERSION="${SPACEFX_VERSION_CHANNEL_TAG}" \
--annotation-config azure-orbital-space-sdk-setup.yaml

/var/spacedev/build/build_containerImage.sh \
Expand All @@ -187,6 +192,7 @@ jobs:
--repo-dir ${PWD} \
--no-spacefx-dev \
--app-name spacesdk-jetson-devicequery \
--build-arg SDK_VERSION="${SPACEFX_VERSION_CHANNEL_TAG}" \
--annotation-config azure-orbital-space-sdk-setup.yaml
done

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ on:
type: string
default: "26.1.3"
pull_request:
branches: [ main ]
branches:
- main
- '[0-9]*.[0-9]*.[0-9]*-nightly'


env:
Expand Down
3 changes: 3 additions & 0 deletions tests/dev_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ echo "...running copy_to_spacedev.sh"
# Copy the scripts ino the entry point for the devcontainer feature
${WORKING_DIR}/.vscode/copy_to_spacedev.sh --output-dir ${WORKING_DIR}/.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup

source ${WORKING_DIR}/.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup/env/spacefx.env
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && VERSION="${VERSION}-${SPACEFX_CHANNEL}"

echo "...building the devcontainer feature..."
# Build the devcontainer feature
devcontainer features package --force-clean-output-folder ${WORKING_DIR}/.devcontainer/features --output-folder ${WORKING_DIR}/output/spacefx-dev
Expand Down
Loading