[Release] Support release candidate publishing and promotion to stable (#8081)

romilbhardwaj · web-flow · commit 5e0a44d90e1e · 2025-11-25T14:02:35.000-08:00
* Handle rc in semver, update docker build

* Add rc promotion support

* add post1 support

* add post1 support
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -248,11 +248,21 @@ jobs:
       - name: Create multi-platform manifest
         run: |
           # Create multi-platform manifest from temporary tags
+          VERSION="${{ needs.prepare.outputs.version }}"
+          
+          # Determine if this is a pre-release version (contains rc, alpha, beta, or dev)
+          if [[ "$VERSION" =~ (rc|alpha|beta|dev) ]]; then
+            echo "Pre-release version detected ($VERSION), skipping :latest tag"
+            TAGS="-t ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:$VERSION"
+          else
+            echo "Stable release version detected ($VERSION), updating :latest tag"
+            TAGS="-t ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:latest -t ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:$VERSION"
+          fi
+          
           docker buildx imagetools create \
-            -t ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:latest \
-            -t ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:${{ needs.prepare.outputs.version }} \
-            ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:${{ needs.prepare.outputs.version }}-linux-amd64 \
-            ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:${{ needs.prepare.outputs.version }}-linux-arm64
+            $TAGS \
+            ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:$VERSION-linux-amd64 \
+            ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:$VERSION-linux-arm64
 
       - name: Clean up temporary tags
         if: always()
@@ -274,9 +284,18 @@ jobs:
 
       - name: Summary of final tags
         run: |
+          VERSION="${{ needs.prepare.outputs.version }}"
           echo "✅ Multi-platform tags created:"
-          echo "   - ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:latest"
-          echo "   - ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:${{ needs.prepare.outputs.version }}"
+          echo "   - ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:$VERSION"
+          
+          # Check if latest tag was updated
+          if [[ "$VERSION" =~ (rc|alpha|beta|dev) ]]; then
+            echo ""
+            echo "ℹ️  Pre-release version - :latest tag not updated"
+          else
+            echo "   - ${{ secrets.DOCKER_USERNAME }}/${{ inputs.package_name }}:latest"
+          fi
+          
           echo ""
           echo "🚀 Built with native runners for maximum performance!"
           echo "🧹 Temporary tags cleaned up automatically!"
diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml
@@ -92,8 +92,20 @@ jobs:
         run: |
           version="${{ inputs.version }}"
           # Convert PEP440 version to SemVer if needed for Helm versioning
-          # Handle cases like 1.0.0.dev20250218 -> 1.0.0-dev.20250218
+          # Handle cases like:
+          #   1.0.0.dev20250218 -> 1.0.0-dev.20250218
+          #   0.11.0rc0 -> 0.11.0-rc.0
+          #   0.11.0a1 -> 0.11.0-alpha.1
+          #   0.11.0b2 -> 0.11.0-beta.2
+          #   0.11.0.post1 -> 0.11.0+post.1
           semversion=$(echo "$version" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)\.dev([0-9]+)/\1-dev.\2/')
+          semversion=$(echo "$semversion" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)rc([0-9]+)/\1-rc.\2/')
+          semversion=$(echo "$semversion" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)a([0-9]+)/\1-alpha.\2/')
+          semversion=$(echo "$semversion" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)b([0-9]+)/\1-beta.\2/')
+          # Post-releases use build metadata (+) since SemVer has no direct equivalent to PEP440's .post
+          # PEP440 .post means "after release", but SemVer build metadata has same precedence.
+          # TODO(romilb): If both 0.11.0 and 0.11.0+post.1 exist, Helm's "latest" behavior is undefined - some sources claim the newer one wins. Need to verify this.
+          semversion=$(echo "$semversion" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)\.post([0-9]+)/\1+post.\2/')
           
           # Update the version and name in the main skypilot chart
           sed -i "s/^version:.*$/version: ${semversion}/" src/charts/skypilot/Chart.yaml
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -6,14 +6,19 @@ on:
   workflow_dispatch:
     inputs:
       release_version:
-        description: 'Release version (e.g., 0.9.0)'
+        description: 'Release version (e.g., 0.9.0 or 0.9.0rc1)'
         required: false
         type: string
       skip_version_checks:
         description: 'Skip version verification steps'
         required: false
         type: boolean
         default: false
+      skip_smoke_tests:
+        description: 'Skip smoke tests (recommended when promoting tested RC to stable)'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   release-build:
@@ -184,6 +189,10 @@ jobs:
 
   smoke-tests:
     needs: release-build
+    if: |
+      always() && 
+      needs.release-build.result == 'success' &&
+      github.event.inputs.skip_smoke_tests != 'true'
     uses: ./.github/workflows/buildkite-trigger-wait.yml
     with:
       commit: ${{ needs.release-build.outputs.new_commit_sha }}
@@ -198,6 +207,10 @@ jobs:
 
   quicktest-core:
     needs: release-build
+    if: |
+      always() && 
+      needs.release-build.result == 'success' &&
+      github.event.inputs.skip_smoke_tests != 'true'
     uses: ./.github/workflows/buildkite-trigger-wait.yml
     with:
       commit: ${{ needs.release-build.outputs.new_commit_sha }}
@@ -213,6 +226,10 @@ jobs:
 
   quicktest-core-previous-minor:
     needs: release-build
+    if: |
+      always() && 
+      needs.release-build.result == 'success' &&
+      github.event.inputs.skip_smoke_tests != 'true'
     uses: ./.github/workflows/buildkite-trigger-wait.yml
     with:
       commit: ${{ needs.release-build.outputs.new_commit_sha }}
@@ -228,6 +245,10 @@ jobs:
 
   smoke-tests-remote-server-kubernetes:
     needs: release-build
+    if: |
+      always() && 
+      needs.release-build.result == 'success' &&
+      github.event.inputs.skip_smoke_tests != 'true'
     uses: ./.github/workflows/buildkite-trigger-wait.yml
     with:
       commit: ${{ needs.release-build.outputs.new_commit_sha }}
@@ -244,6 +265,10 @@ jobs:
 
   release-tests:
     needs: release-build
+    if: |
+      always() && 
+      needs.release-build.result == 'success' &&
+      github.event.inputs.skip_smoke_tests != 'true'
     uses: ./.github/workflows/buildkite-trigger-wait.yml
     with:
       commit: ${{ needs.release-build.outputs.new_commit_sha }}
@@ -268,13 +293,47 @@ jobs:
       - name: Create release branch and PR
         env:
           GH_TOKEN: ${{ secrets.GH_PAT_FOR_RELEASE }}
+          TEST_BRANCH: ${{ needs.release-build.outputs.test_branch }}
+          RELEASE_BRANCH: ${{ needs.release-build.outputs.release_branch }}
+          RELEASE_VERSION: ${{ needs.release-build.outputs.release_version }}
+          SKIP_SMOKE_TESTS: ${{ github.event.inputs.skip_smoke_tests }}
         run: |
           # Configure git
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
 
-          # Create PR with buildkite links
-          PR_BODY="Release ${{ needs.release-build.outputs.release_version }}
+          # Detect if this is an RC promotion
+          SOURCE_BRANCH="${{ github.ref_name }}"
+          IS_RC_PROMOTION="false"
+          if [[ "$SOURCE_BRANCH" =~ ^releases/.*rc[0-9]+$ ]]; then
+            IS_RC_PROMOTION="true"
+            RC_VERSION=$(echo "$SOURCE_BRANCH" | sed 's/releases\///')
+          fi
+
+          # Build PR body based on whether tests were skipped
+          if [ "$SKIP_SMOKE_TESTS" == "true" ]; then
+            if [ "$IS_RC_PROMOTION" == "true" ]; then
+              PR_BODY="## Promote RC to Stable Release ${RELEASE_VERSION}
+          
+          **Source:** \`$SOURCE_BRANCH\` (RC version: $RC_VERSION)  
+          **Target:** Stable release \`${RELEASE_VERSION}\`
+          
+          ⚠️ **Smoke tests were SKIPPED** - This release is being promoted from a tested RC.
+          
+          ### Pre-release Testing
+          This version was previously tested as release candidate \`$RC_VERSION\` and deemed stable by early adopters.
+          
+          ### Changes in this PR
+          - Updated \`sky/__init__.py\`: \`$RC_VERSION\` → \`${RELEASE_VERSION}\`
+          - Updated \`charts/skypilot/values.yaml\`: Docker image tag \`$RC_VERSION\` → \`${RELEASE_VERSION}\`"
+            else
+              PR_BODY="Release ${RELEASE_VERSION}
+          
+          ⚠️ **Smoke tests were SKIPPED** - Please ensure manual testing was performed."
+            fi
+          else
+            # Normal release with test results
+            PR_BODY="Release ${RELEASE_VERSION}
 
           Buildkite Test Links:
           - [Full Smoke Tests](https://buildkite.com/skypilot-1/full-smoke-tests-run/builds/${{ needs.smoke-tests.outputs.build_number }}) - $([ "${{ needs.smoke-tests.outputs.build_status }}" == "success" ] && echo "✅ Success" || echo "❌ Failed")
@@ -284,17 +343,40 @@ jobs:
           - [Release Tests](https://buildkite.com/skypilot-1/release/builds/${{ needs.release-tests.outputs.build_number }}) - ⏳ (not waiting for completion)
 
           *Release Tests may take up to 24 hours to complete and might fail due to resource constraints.*"
+          fi
 
-          echo "Creating PR from ${{ needs.release-build.outputs.test_branch }} to ${{ needs.release-build.outputs.release_branch }}"
+          echo "Creating PR from ${TEST_BRANCH} to ${RELEASE_BRANCH}"
 
-          gh pr create --base ${{ needs.release-build.outputs.release_branch }} --head ${{ needs.release-build.outputs.test_branch }} \
-            --title "Release ${{ needs.release-build.outputs.release_version }}" \
+          gh pr create --base ${RELEASE_BRANCH} --head ${TEST_BRANCH} \
+            --title "Release ${RELEASE_VERSION}" \
             --body "${PR_BODY}"
 
       - name: Summary
         if: always()
+        env:
+          SKIP_SMOKE_TESTS: ${{ github.event.inputs.skip_smoke_tests }}
         run: |
-          cat <<EOF >> "$GITHUB_STEP_SUMMARY"
+          if [ "$SKIP_SMOKE_TESTS" == "true" ]; then
+            SOURCE_BRANCH="${{ github.ref_name }}"
+            if [[ "$SOURCE_BRANCH" =~ ^releases/.*rc[0-9]+$ ]]; then
+              RC_VERSION=$(echo "$SOURCE_BRANCH" | sed 's/releases\///')
+              cat <<EOF >> "$GITHUB_STEP_SUMMARY"
+          # Release ${{ needs.release-build.outputs.release_version }}
+
+          ## RC Promotion
+          Promoting from \`$RC_VERSION\` to stable version \`${{ needs.release-build.outputs.release_version }}\`
+
+          ⚠️ **Smoke tests were SKIPPED** - This release was promoted from a tested RC.
+          EOF
+            else
+              cat <<EOF >> "$GITHUB_STEP_SUMMARY"
+          # Release ${{ needs.release-build.outputs.release_version }}
+
+          ⚠️ **Smoke tests were SKIPPED** - Please ensure manual testing was performed.
+          EOF
+            fi
+          else
+            cat <<EOF >> "$GITHUB_STEP_SUMMARY"
           # Release ${{ needs.release-build.outputs.release_version }}
 
           ## Buildkite Test Links
@@ -306,3 +388,4 @@ jobs:
 
           *Release Tests may take up to 24 hours to complete and might fail due to resource constraints.*
           EOF
+          fi
