Skip to content

Commit 14d9a1c

Browse files
csun-cpointecsun-cpointe
authored
Merge pull request #606 from boozallen/epw-test-ci-env
Stabilize CI build
2 parents 18cee37 + 6eaf986 commit 14d9a1c

File tree

5 files changed

+133
-4
lines changed

5 files changed

+133
-4
lines changed

‎.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,21 @@ jobs:
103103
- name: Save docker build cache
104104
id: save-docker-build
105105
uses: runs-on/cache/save@v4
106-
if: always() && steps.cached-docker-build.outputs.cache-hit != 'true'
106+
if: ${{ !cancelled() && steps.cached-docker-build.outputs.cache-hit != 'true' }}
107107
with:
108108
path: ~/.docker/cache
109109
key: docker-cache-${{ hashFiles('**/Dockerfile') }}
110110
- name: Save m2 repository cache
111111
id: save-m2-repo
112112
uses: runs-on/cache/save@v4
113-
if: always() && steps.cached-m2-repo.outputs.cache-hit != 'true'
113+
if: ${{ !cancelled() && steps.cached-m2-repo.outputs.cache-hit != 'true' }}
114114
with:
115115
path: ~/.m2/repository
116116
key: maven-${{ hashFiles('**/pom.xml') }}
117117
- name: Save m2 build cache
118118
id: save-m2-build
119119
uses: runs-on/cache/save@v4
120-
if: always() && steps.cached-m2-build.outputs.cache-hit != 'true'
120+
if: ${{ !cancelled() && steps.cached-m2-build.outputs.cache-hit != 'true' }}
121121
with:
122122
path: ~/.m2/build-cache
123123
key: maven-build-cache-${{ hashFiles('**/pom.xml') }}

‎devops/arc-runner-service-account.yaml

+40
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,43 @@ kind: ServiceAccount
33
metadata:
44
namespace: gh-actions-aissemble
55
name: arc-runner-set-aissemble-gha-rs-custom-permissions
6+
---
7+
apiVersion: rbac.authorization.k8s.io/v1
8+
kind: RoleBinding
9+
metadata:
10+
name: arc-runner-set-aissemble-gha-rs-custom-permissions
11+
namespace: gh-actions-aissemble
12+
roleRef:
13+
apiGroup: rbac.authorization.k8s.io
14+
kind: Role
15+
name: arc-runner-set-aissemble-gha-rs-custom-permissions
16+
subjects:
17+
- kind: ServiceAccount
18+
namespace: gh-actions-aissemble
19+
name: arc-runner-set-aissemble-gha-rs-custom-permissions
20+
---
21+
apiVersion: rbac.authorization.k8s.io/v1
22+
kind: Role
23+
metadata:
24+
namespace: gh-actions-aissemble
25+
name: arc-runner-set-aissemble-gha-rs-custom-permissions
26+
rules:
27+
- apiGroups:
28+
- ""
29+
resources:
30+
- pods
31+
- pods/exec
32+
verbs:
33+
- get
34+
- list
35+
- create
36+
- delete
37+
- apiGroups:
38+
- apps
39+
resources:
40+
- deployments
41+
verbs:
42+
- get
43+
- list
44+
- create
45+
- delete

‎devops/runnerset-values.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ maxRunners: 3
55
template:
66
spec:
77
serviceAccountName: "arc-runner-set-aissemble-gha-rs-custom-permissions"
8+
nodeSelector:
9+
beta.kubernetes.io/instance-type: t4g.xlarge

‎extensions/extensions-alerting/extensions-alerting-teams/src/test/resources/application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
# This software package is licensed under the Booz Allen Public License. All Rights Reserved.
88
# #L%
99
###
10-
com.boozallen.aissemble.alerting.teams.TeamsClient/mp-rest/url=https://cpointe.webhook.office.com/webhookb2/97914af6-343d-4e13-a9e0-3ca7365c222f@be6bc72b-cb11-4b54-94ba-05c515f5e7ba/IncomingWebhook/5d770780ae41427ead508866a93b54e2/26a15c35-029b-406f-8ec4-d4d1be26f058
10+
com.boozallen.aissemble.alerting.teams.TeamsClient/mp-rest/url=https://cpointe.webhook.office.com/webhookb2/97914af6-343d-4e13-a9e0-3ca7365c222f@be6bc72b-cb11-4b54-94ba-05c515f5e7ba/IncomingWebhook/5d770780ae41427ead508866a93b54e2/26a15c35-029b-406f-8ec4-d4d1be26f058/0001nPuq0DnNSuA6nDCLwIFs6rxKEyOwLJ4QgPXzivuYXlU1
1111
com.boozallen.aissemble.alerting.teams.TeamsClient/mp-rest/scope=javax.inject.Singleton
1212
quarkus.kafka.devservices.image-name=redpandadata/redpanda:v24.1.7

‎extensions/extensions-docker/pom.xml

+87
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,92 @@
148148
</pluginManagement>
149149
</build>
150150
</profile>
151+
<profile>
152+
<id>gh-build</id>
153+
<properties>
154+
<docker.builder.name>k8s-multiarch</docker.builder.name>
155+
<!-- Ideally, we'd pass this in with `config` flag while provisioning the builder, but it doesn't appear to be working. -->
156+
<docker.builder.stateDir>~/.docker</docker.builder.stateDir>
157+
</properties>
158+
<build>
159+
<plugins>
160+
<plugin>
161+
<groupId>org.codehaus.mojo</groupId>
162+
<artifactId>exec-maven-plugin</artifactId>
163+
<inherited>false</inherited>
164+
<executions>
165+
<execution>
166+
<id>provision-docker-builder-amd</id>
167+
<phase>initialize</phase>
168+
<goals>
169+
<goal>exec</goal>
170+
</goals>
171+
<configuration>
172+
<executable>docker</executable>
173+
<arguments>
174+
<argument>builder</argument>
175+
<argument>create</argument>
176+
<argument>--name=${docker.builder.name}</argument>
177+
<argument>--bootstrap</argument>
178+
<argument>--driver=kubernetes</argument>
179+
<argument>--platform=linux/amd64</argument>
180+
<argument>--driver-opt="nodeselector=kubernetes.io/arch=amd64","image=docker.io/moby/buildkit:v0.19.0"</argument>
181+
</arguments>
182+
</configuration>
183+
</execution>
184+
<execution>
185+
<id>provision-docker-builder-arm</id>
186+
<phase>initialize</phase>
187+
<goals>
188+
<goal>exec</goal>
189+
</goals>
190+
<configuration>
191+
<executable>docker</executable>
192+
<arguments>
193+
<argument>builder</argument>
194+
<argument>create</argument>
195+
<argument>--name=${docker.builder.name}</argument>
196+
<argument>--bootstrap</argument>
197+
<argument>--append</argument>
198+
<argument>--driver=kubernetes</argument>
199+
<argument>--platform=linux/arm64</argument>
200+
<argument>--driver-opt="nodeselector=kubernetes.io/arch=arm64","image=docker.io/moby/buildkit:v0.19.0"</argument>
201+
</arguments>
202+
</configuration>
203+
</execution>
204+
</executions>
205+
</plugin>
206+
</plugins>
207+
<pluginManagement>
208+
<plugins>
209+
<plugin>
210+
<groupId>${group.fabric8.plugin}</groupId>
211+
<artifactId>docker-maven-plugin</artifactId>
212+
<executions>
213+
<execution>
214+
<id>default-push</id>
215+
<phase>deploy</phase>
216+
<goals>
217+
<goal>push</goal>
218+
</goals>
219+
<configuration>
220+
<images>
221+
<image>
222+
<build>
223+
<buildx>
224+
<builderName>${docker.builder.name}</builderName>
225+
<dockerStateDir>${docker.builder.stateDir}</dockerStateDir>
226+
</buildx>
227+
</build>
228+
</image>
229+
</images>
230+
</configuration>
231+
</execution>
232+
</executions>
233+
</plugin>
234+
</plugins>
235+
</pluginManagement>
236+
</build>
237+
</profile>
151238
</profiles>
152239
</project>

0 commit comments

Comments
 (0)