updated image calcuations

microsoft · Sep 5, 2024 · 85c15ad · 85c15ad
1 parent 328252d
commit 85c15ad
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -12,6 +12,7 @@ on:
     push:
         branches:
         - main
+        - '[0-9]*.[0-9]*.[0-9]*-nightly'
 
 
 env:
@@ -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/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:

diff --git 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
@@ -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
-Original file 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 Down @@