Upversion podman version in the workflows to latest dev: 5.1.0

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
podman-desktop · Mar 27, 2024 · 519cb8e · 519cb8e
1 parent 9d6d8c7
commit 519cb8e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/desktop-e2e-podman-windows-matrix.yaml b/.github/workflows/desktop-e2e-podman-windows-matrix.yaml
@@ -20,12 +20,12 @@ on:
         type: string
         required: true
       podman_remote_url:
-        default: 'https://github.com/containers/podman/releases/download/v4.9.0/podman-remote-release-windows_amd64.zip'
+        default: 'https://github.com/containers/podman/releases/download/v4.9.3/podman-remote-release-windows_amd64.zip'
         description: 'podman remote zip'
         type: string
         required: true
       podman_version:
-        default: '4.9.0'
+        default: '4.9.3'
         description: 'Podman folder version in archive'
         type: 'string'
         required: true

diff --git a/.github/workflows/desktop-e2e-test-job-windows.yaml b/.github/workflows/desktop-e2e-test-job-windows.yaml
@@ -20,12 +20,12 @@ on:
         type: string
         required: true
       podman_remote_url:
-        default: 'https://github.com/containers/podman/releases/download/v4.9.0/podman-remote-release-windows_amd64.zip'
+        default: 'https://github.com/containers/podman/releases/download/v4.9.3/podman-remote-release-windows_amd64.zip'
         description: 'podman remote zip'
         type: string
         required: true
       podman_version:
-        default: '4.9.0'
+        default: '4.9.3'
         description: 'Podman folder version in archive'
         type: 'string'
         required: true
@@ -59,6 +59,9 @@ jobs:
   windows:
     name: ${{ matrix.windows-version }} - Debug
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: write
     env:
       QENVS_VERSION: v0.6.3
     strategy:

diff --git a/.github/workflows/podman-desktop-e2e-nightly-windows.yaml b/.github/workflows/podman-desktop-e2e-nightly-windows.yaml
@@ -25,6 +25,16 @@ on:
         description: 'Env. Variables passed into target machine, ie: VAR1=xxx,VAR2=true,VAR3=15,VAR4="Pass me along"'
         type: 'string'
         required: true
+      podman_remote_url:
+        default: 'https://api.cirrus-ci.com/v1/artifact/github/containers/podman/Artifacts/binary/podman-remote-release-windows_amd64.zip'
+        description: 'podman remote zip'
+        type: string
+        required: true
+      podman_version:
+        default: '5.1.0-dev'
+        description: 'Podman folder version in archive'
+        type: 'string'
+        required: true
 
 jobs:
   windows:
@@ -49,11 +59,15 @@ jobs:
         DEFAULT_BRANCH: 'main'
         DEFAULT_NPM_TARGET: 'test:e2e'
         DEFAULT_ENV_VARS: 'TEST_PODMAN_MACHINE=true'
+        DEFAULT_VERSION: '5.1.0-dev'
+        DEFAULT_URL: 'https://api.cirrus-ci.com/v1/artifact/github/containers/podman/Artifacts/binary/podman-remote-release-windows_amd64.zip'
       run: |
         echo "FORK=${{ github.event.inputs.fork || env.DEFAULT_FORK }}" >> $GITHUB_ENV
         echo "BRANCH=${{ github.event.inputs.branch || env.DEFAULT_BRANCH }}" >> $GITHUB_ENV
         echo "NPM_TARGET=${{ github.event.inputs.npm_target || env.DEFAULT_NPM_TARGET }}" >> $GITHUB_ENV
         echo "ENV_VARS=${{ github.event.inputs.env_vars || env.DEFAULT_ENV_VARS }}" >> $GITHUB_ENV
+        echo "PODMAN_VERSION=${{ github.event.inputs.podman_version || env.DEFAULT_VERSION }}" >> $GITHUB_ENV
+        echo "PODMAN_URL=${{ github.event.inputs.podman_remote_url || env.DEFAULT_URL }}" >> $GITHUB_ENV
 
     - name: Create instance
       run: |
@@ -132,8 +146,8 @@ jobs:
           -v $PWD:/data:z \
           quay.io/odockal/pde2e-podman:v0.0.1-windows  \
             pd-e2e/podman.ps1 \
-              -downloadUrl "https://api.cirrus-ci.com/v1/artifact/github/containers/podman/Artifacts/binary/podman-remote-release-windows_amd64.zip" \
-              -version '5.0.0-dev' \
+              -downloadUrl ${{ env.PODMAN_URL }} \
+              -version ${{ env.PODMAN_VERSION }} \
               -targetFolder pd-e2e \
               -resultsFolder results \
               -initialize 0 \