ci: call test-vhd-no-egress github workflow from create-release-branch (#119)

2023-03-22 21:44:40 -07:00 · 2023-03-22 21:44:40 -07:00 · f2b5eb7afd
--- a/.github/workflows/create-release-branch.yaml
+++ b/.github/workflows/create-release-branch.yaml
@ -9,8 +9,24 @@ on:
        description: 'Which branch to source release branch from? (default: master)'
        required: false
        default: 'master'
+      LINUX_NODE_IMAGE_VERSION:
+        description: 'What is the Linux SIG image version?'
+        required: true
+        default: 2023.079.1
+      WINDOWS_NODE_IMAGE_VERSION:
+        description: 'What is the Windows SIG image version?'
+        required: true
+        default: 2023.079.1
 jobs:
+  validate-no-egress:
+    uses: ./.github/workflows/test-vhd-no-egress.yaml
+    with:
+      from_branch: ${{github.event.inputs.from_branch}}
+      LINUX_NODE_IMAGE_VERSION: ${{github.event.inputs.LINUX_NODE_IMAGE_VERSION}}
+      WINDOWS_NODE_IMAGE_VERSION: ${{github.event.inputs.WINDOWS_NODE_IMAGE_VERSION}}
+    secrets: inherit
  create-release-branch:
+    needs: validate-no-egress
    runs-on: ubuntu-latest
    steps:
      - name: validate version
@ -18,112 +34,6 @@ jobs:
      - uses: actions/checkout@v3
        with:
          ref: ${{github.event.inputs.from_branch}}
-      - name: Setup SSH Keys and known_hosts
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-        run: |
-          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-      - name: install go
-        uses: actions/setup-go@v3
-        with:
-          go-version-file: 'go.mod'
-      - name: Install helm
-        run: |
-          curl https://baltocdn.com/helm/signing.asc | sudo apt-key add -
-          sudo apt-get install apt-transport-https --yes
-          echo "deb https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list
-          sudo apt-get update
-          sudo apt-get install helm
-      - name: Install k
-        run: |
-          sudo curl -o /usr/local/bin/k https://raw.githubusercontent.com/jakepearson/k/master/k
-          sudo chmod +x /usr/local/bin/k
-      - name: Build aks-engine-azurestack binary
-        run: make build-binary
-      - name: Validate 1.23 no-egress docker scenario
-        env:
-          ORCHESTRATOR_RELEASE: "1.23"
-          CLUSTER_DEFINITION: "examples/no_outbound.json"
-          SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
-          CLIENT_SECRET: ${{ secrets.TEST_AZURE_SP_PW }}
-          LOCATION: "eastus"
-          TENANT_ID: ${{ secrets.TEST_AZURE_TENANT_ID }}
-          CLEANUP_ON_EXIT: true
-          CLEANUP_IF_FAIL: true
-          SKIP_LOGS_COLLECTION: true
-          SKIP_TEST: true
-          AZURE_CORE_ONLY_SHOW_ERRORS: true
-          BLOCK_SSH: true
-          RETAIN_SSH: false
-          CONTAINER_RUNTIME: docker
-          WINDOWS_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          WINDOWS_NODE_IMAGE_RESOURCE_GROUP: AKSeImages
-          WINDOWS_NODE_IMAGE_GALLERY: AKSeGallery
-          WINDOWS_NODE_IMAGE_NAME: windows2019docker
-          WINDOWS_NODE_IMAGE_VERSION: 2023.033.2
-          LINUX_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          LINUX_NODE_IMAGE_RESOURCE_GROUP: AKSeImages
-          LINUX_NODE_IMAGE_GALLERY: AKSeGallery
-          LINUX_NODE_IMAGE_NAME: ubuntu-20.04
-          LINUX_NODE_IMAGE_VERSION: 2023.042.1
-        run: make test-kubernetes
-      - name: Validate 1.23 no-egress containerd scenario
-        env:
-          ORCHESTRATOR_RELEASE: "1.23"
-          CLUSTER_DEFINITION: "examples/no_outbound.json"
-          SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
-          CLIENT_SECRET: ${{ secrets.TEST_AZURE_SP_PW }}
-          LOCATION: "eastus"
-          TENANT_ID: ${{ secrets.TEST_AZURE_TENANT_ID }}
-          CLEANUP_ON_EXIT: true
-          CLEANUP_IF_FAIL: true
-          SKIP_LOGS_COLLECTION: true
-          SKIP_TEST: true
-          AZURE_CORE_ONLY_SHOW_ERRORS: true
-          BLOCK_SSH: true
-          RETAIN_SSH: false
-          CONTAINER_RUNTIME: containerd
-          WINDOWS_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          WINDOWS_NODE_IMAGE_RESOURCE_GROUP: AKSeImages
-          WINDOWS_NODE_IMAGE_GALLERY: AKSeGallery
-          WINDOWS_NODE_IMAGE_NAME: windows2019containerd
-          WINDOWS_NODE_IMAGE_VERSION: 2023.033.2
-          LINUX_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          LINUX_NODE_IMAGE_RESOURCE_GROUP: AKSeImages
-          LINUX_NODE_IMAGE_GALLERY: AKSeGallery
-          LINUX_NODE_IMAGE_NAME: ubuntu-20.04
-          LINUX_NODE_IMAGE_VERSION: 2023.042.1
-        run: make test-kubernetes
-      - name: Validate 1.24 no-egress containerd scenario
-        env:
-          ORCHESTRATOR_RELEASE: "1.24"
-          CLUSTER_DEFINITION: "examples/no_outbound.json"
-          SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
-          CLIENT_SECRET: ${{ secrets.TEST_AZURE_SP_PW }}
-          LOCATION: "eastus"
-          TENANT_ID: ${{ secrets.TEST_AZURE_TENANT_ID }}
-          CLEANUP_ON_EXIT: true
-          CLEANUP_IF_FAIL: true
-          SKIP_LOGS_COLLECTION: true
-          SKIP_TEST: true
-          AZURE_CORE_ONLY_SHOW_ERRORS: true
-          BLOCK_SSH: true
-          RETAIN_SSH: false
-          CONTAINER_RUNTIME: containerd
-          WINDOWS_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          WINDOWS_NODE_IMAGE_RESOURCE_GROUP: AKSeImages
-          WINDOWS_NODE_IMAGE_GALLERY: AKSeGallery
-          WINDOWS_NODE_IMAGE_NAME: windows2019containerd
-          WINDOWS_NODE_IMAGE_VERSION: 2023.033.2
-          LINUX_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
-          LINUX_NODE_IMAGE_RESOURCE_GROUP: AKSeImages
-          LINUX_NODE_IMAGE_GALLERY: AKSeGallery
-          LINUX_NODE_IMAGE_NAME: ubuntu-20.04
-          LINUX_NODE_IMAGE_VERSION: 2023.042.1
-        run: make test-kubernetes
      - name: create branch
        run: |
          git remote -v
--- a/.github/workflows/test-vhd-no-egress.yaml
+++ b/.github/workflows/test-vhd-no-egress.yaml
@ -3,6 +3,10 @@ name: Test VHD No Egress
 on:
  workflow_dispatch:
    inputs:
+      from_branch:
+        description: 'Which branch are we testing? (if left blank, by default will use the branch used to trigger workflow)'
+        required: false
+        default: ''
      LINUX_NODE_IMAGE_VERSION:
        description: 'What is the Linux SIG image version?'
        required: true
@ -11,12 +15,25 @@ on:
        description: 'What is the Windows SIG image version?'
        required: true
        default: 2023.079.1
+  workflow_call:
+    inputs:
+      from_branch:
+        required: true
+        type: string
+      LINUX_NODE_IMAGE_VERSION:
+        type: string
+        required: true
+      WINDOWS_NODE_IMAGE_VERSION:
+        type: string
+        required: true
 jobs:
  e2e:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+        with:
+          ref: ${{inputs.from_branch}}
      - name: Set up Go
        uses: actions/setup-go@v3
        with: