Merge pull request #1010 from OpenLiberty/staging

Merge staging to prod - update docker-daily-build (#1009)
OpenLiberty · Nov 29, 2023 · 7a69bda · 7a69bda
2 parents 893f200 + 4864778
commit 7a69bda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/docker-daily-test-java17.yml b/.github/workflows/docker-daily-test-java17.yml
@@ -18,6 +18,9 @@ on:
         description: Guide to build
         default: "all"
         required: true
+      branch:
+        description: Branch to test
+        required: false
 
 env:
   DOCKER_USERNAME: ${{ secrets.CP_STG_USERNAME }}
@@ -49,6 +52,7 @@ jobs:
           echo   date:      ${{ github.event.inputs.date }}
           echo   driver:    ${{ github.event.inputs.driver }}
           echo   guide:     ${{ github.event.inputs.guide }}
+          echo   branch:    ${{ github.event.inputs.branch }}
           echo "Build level: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}"
   test-guide:
     needs: [ get-repos ]
@@ -68,6 +72,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: OpenLiberty/${{ matrix.repos }}
+          ref: ${{ github.event.inputs.branch }}
           path: ${{ matrix.repos }}
       - name: Set permissions
         run: chmod +x ${{ matrix.repos }}/scripts/*.sh

diff --git a/.github/workflows/docker-daily-test.yml b/.github/workflows/docker-daily-test.yml
@@ -18,6 +18,9 @@ on:
         description: Guide to build
         default: "all"
         required: true
+      branch:
+        description: Branch to test
+        required: false
       jdk_level:
         description: JDK level to test
         default: "11"
@@ -53,6 +56,7 @@ jobs:
           echo   date:      ${{ github.event.inputs.date }}
           echo   driver:    ${{ github.event.inputs.driver }}
           echo   guide:     ${{ github.event.inputs.guide }}
+          echo   branch:    ${{ github.event.inputs.branch }}
           echo   jdk_level: ${{ github.event.client_payload.jdk }}${{ github.event.inputs.jdk_level }}
           echo "Build level: ${{ github.event.client_payload.build-level }}${{ github.event.inputs.build }}"
   test-guide:
@@ -73,6 +77,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: OpenLiberty/${{ matrix.repos }}
+          ref: ${{ github.event.inputs.branch }}
           path: ${{ matrix.repos }}
       - name: Set permissions
         run: chmod +x ${{ matrix.repos }}/scripts/*.sh