Ci fixes again and again (#332)

rhdhorchestrator · Jul 23, 2024 · bb25c2d · bb25c2d
1 parent be2aa1b
commit bb25c2d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   shellcheck:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Shellcheck

diff --git a/.github/workflows/m2k-func.yaml b/.github/workflows/m2k-func.yaml
@@ -22,7 +22,7 @@ env:
 
 jobs:
   build-and-push-m2k-func:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
 
     - uses: actions/checkout@v4
@@ -39,7 +39,6 @@ jobs:
 
     - name: Build Image
       id: build-image
-      if: ${{ ! inputs.it_mode }}
       run: |
         make WORKFLOW_ID=${{ inputs.workflow_id }} \
           APPLICATION_ID=${{ inputs.application_id }} \
@@ -93,7 +92,7 @@ jobs:
 
   generate-manifests:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04	
     steps:
     - uses: actions/checkout@v4
     - name: Generate Manifests

diff --git a/.github/workflows/move2kube-e2e.yaml b/.github/workflows/move2kube-e2e.yaml
@@ -27,7 +27,7 @@ jobs:
       it_mode: true
 
   run-m2k-e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/mta-e2e.yaml b/.github/workflows/mta-e2e.yaml
@@ -21,7 +21,7 @@ jobs:
       workflow_id: mta
       it_mode: true
   run-e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/mta-v6.x-e2e.yaml b/.github/workflows/mta-v6.x-e2e.yaml
@@ -21,7 +21,7 @@ jobs:
       workflow_id: mta-v6.x
       it_mode: true
   run-e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/mta-v7.x-e2e.yaml b/.github/workflows/mta-v7.x-e2e.yaml
@@ -21,7 +21,7 @@ jobs:
       workflow_id: mta-v7.x
       it_mode: true
   run-e2e:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     steps:
       - name: Create k8s Kind Cluster

diff --git a/.github/workflows/workflow-executor.yml b/.github/workflows/workflow-executor.yml
@@ -22,7 +22,7 @@ env:
 
 jobs:
   build-and-push-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Log in to Red Hat Registry
@@ -53,7 +53,7 @@ jobs:
           push-image
 
   gen-and-push-manifests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
 

diff --git a/Makefile b/Makefile
@@ -134,7 +134,7 @@ ifeq ($(IS_APPLICATION),true)
 		$(BUILD_ARGS) $(EXTRA_ARGS) \
 		--tag ${IMAGE_NAME}:${IMAGE_TAG} --tag ${IMAGE_NAME}:latest .
 else
-	@$(CONTAINER_ENGINE) build -f $(DOCKERFILE) \
+	@cd $(WORKDIR)/ && $(CONTAINER_ENGINE) build -f $(DOCKERFILE) \
 		$(BUILD_ARGS) $(EXTRA_ARGS) \
 		--tag ${IMAGE_NAME}:${IMAGE_TAG} --tag ${IMAGE_NAME}:latest .
 endif