Refine workflows (#359)

smecalculus · Feb 23, 2024 · 54528d7 · 54528d7
1 parent f31263b
commit 54528d7
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 34 deletions.
diff --git a/.github/workflows/sanity.yaml → .github/workflows/task_proposal.yaml b/.github/workflows/sanity.yaml → .github/workflows/task_proposal.yaml
@@ -1,5 +1,5 @@
 ---
-name: Sanity
+name: Task proposal
 
 on:
   pull_request:
@@ -62,7 +62,7 @@ jobs:
     name: Everything is fine
     needs: [up-to-binaries]
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 5
     if: ${{ always() }}
     steps:
       - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled') }}

diff --git a/.github/workflows/convincing.yaml → .github/workflows/work_change.yaml b/.github/workflows/convincing.yaml → .github/workflows/work_change.yaml
@@ -1,8 +1,9 @@
 ---
-name: Convincing
+name: Work change
 
 on:
   pull_request:
+    types: [synchronize]
     branches:
       - main
   workflow_dispatch:
@@ -81,7 +82,7 @@ jobs:
     name: Everything is fine
     needs: [up-to-images]
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 5
     if: ${{ always() }}
     steps:
       - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled') }}

diff --git a/.github/workflows/beyond-doubt.yaml → .github/workflows/work_proposal.yaml b/.github/workflows/beyond-doubt.yaml → .github/workflows/work_proposal.yaml
@@ -1,10 +1,14 @@
 ---
-name: Beyond doubt
+name: Work proposal
 
 on:
   merge_group:
     branches:
       - main
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - main
   workflow_dispatch:
 
 env:
@@ -32,15 +36,6 @@ jobs:
         with:
           devenv: ${{ matrix.env.dev }}
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run ansible-playbook sources.yaml
-        run: >-
-          docker run --rm
-          --volume $(pwd):$(pwd)
-          --volume ~/.m2:/root/.m2
-          --workdir $(pwd)/baker/ansible
-          ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }}
-          ansible-playbook sources.yaml
-          -e devenv=${{ matrix.env.dev }}
       - name: Run ansible-playbook images.yaml
         id: images
         run: >-
@@ -219,7 +214,7 @@ jobs:
     timeout-minutes: 5
     needs: [stack-checking]
     if: ${{ !cancelled() && (contains(needs.*.result, 'success') || contains(needs.*.result, 'failure')) }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       checks: write
     steps:
@@ -237,7 +232,7 @@ jobs:
     name: Everything is fine
     needs: [stack-publishing, stack-reporting]
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 5
     if: ${{ always() }}
     steps:
       - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled') }}

diff --git a/baker/ansible/tasks/app/build-and-check.yaml b/baker/ansible/tasks/app/build-and-check.yaml
@@ -2,22 +2,30 @@
 - name: Build binaries
   ansible.builtin.command:
     cmd: >-
-      mvn
-      --no-snapshot-updates
-      --batch-mode
-      --fail-fast
-      --threads 2
-      --projects {{
-        image_status.results
-        | select('changed')
-        | map(attribute='app.binary')
-        | map('regex_replace', '^', ':')
-        | join(',')
-      }}
-      --also-make
-      clean
-      {{ maven_phase | mandatory }}
-      --define devenv={{ devenv }}
+      mvn clean {{ maven_phase|mandatory }}
+        --no-snapshot-updates
+        --batch-mode
+        --fail-fast
+        --threads 2
+      {% if image_status is defined %}
+        --projects {{
+          image_status.results
+          | select('changed')
+          | map(attribute='app.binary')
+          | map('regex_replace', '^', ':')
+          | join(',')
+        }}
+      {% else %}
+        --projects {{
+          product.apps.values()
+          | flatten
+          | map(attribute='binary')
+          | map('regex_replace', '^', ':')
+          | join(',')
+        }}
+      {% endif %}
+        --also-make
+        --define devenv={{ devenv }}
     chdir: "{{ project.dir }}"
     strip_empty_ends: false
   changed_when: true
@@ -28,7 +36,7 @@
       mvn
       --no-snapshot-updates
       --batch-mode
-      --projects tool
+      --projects :tool
       clean
       antrun:run@coverage
     chdir: "{{ project.dir }}"

diff --git a/baker/ansible/tasks/product/check.yaml b/baker/ansible/tasks/product/check.yaml
@@ -33,7 +33,7 @@
       --no-snapshot-updates
       --batch-mode
       --threads 2
-      --projects test/e2e
+      --projects :e2e
       {% if hostvars.gear.is_virtual.rc == 0 %}
       --activate-profiles docker
       {% endif %}