diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 53a9851..9ce4708 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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" } diff --git a/.devcontainer/test-feature/devcontainer.json b/.devcontainer/test-feature/devcontainer.json index aab0fa8..bd52e06 100644 --- a/.devcontainer/test-feature/devcontainer.json +++ b/.devcontainer/test-feature/devcontainer.json @@ -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" diff --git a/.github/workflows/devcontainer-feature-build-publish.yml b/.github/workflows/devcontainer-feature-build-publish.yml index 9348c74..838a51f 100644 --- a/.github/workflows/devcontainer-feature-build-publish.yml +++ b/.github/workflows/devcontainer-feature-build-publish.yml @@ -12,6 +12,7 @@ on: push: branches: - main + - '[0-9]*.[0-9]*.[0-9]*-nightly' env: @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/run-setup-tests-smb-on.yaml b/.github/workflows/run-setup-tests-smb-on.yaml index dadd35b..bd08f17 100644 --- a/.github/workflows/run-setup-tests-smb-on.yaml +++ b/.github/workflows/run-setup-tests-smb-on.yaml @@ -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 }} @@ -39,7 +39,7 @@ jobs: 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" @@ -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 }} diff --git a/.github/workflows/run-setup-tests.yaml b/.github/workflows/run-setup-tests.yaml index aa4b379..c9ab1f3 100644 --- a/.github/workflows/run-setup-tests.yaml +++ b/.github/workflows/run-setup-tests.yaml @@ -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 }} @@ -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 }} diff --git a/.github/workflows/spacefx-images-build.yml b/.github/workflows/spacefx-images-build.yml index 9334b57..af1b944 100644 --- a/.github/workflows/spacefx-images-build.yml +++ b/.github/workflows/spacefx-images-build.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - '[0-9]*.[0-9]*.[0-9]*-nightly' jobs: build-spacefx-base-image-amd64: @@ -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 @@ -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 @@ -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 }} @@ -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 }} @@ -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 }} @@ -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 @@ -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 \ @@ -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 diff --git a/.github/workflows/test-setup.yaml b/.github/workflows/test-setup.yaml index c43275c..cf08fc2 100644 --- a/.github/workflows/test-setup.yaml +++ b/.github/workflows/test-setup.yaml @@ -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: diff --git a/tests/dev_cluster.sh b/tests/dev_cluster.sh index 55f1cf9..14f2ce9 100755 --- a/tests/dev_cluster.sh +++ b/tests/dev_cluster.sh @@ -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