Skip to content

Commit 7790f01

Browse files
committed
Simplify tasks. Only depend upon pnc-api
1 parent 7bc0ea6 commit 7790f01

File tree

5 files changed

+10
-79
lines changed

5 files changed

+10
-79
lines changed

deploy/pipeline/mw-pipeline-v0.1.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ spec:
165165
- name: url
166166
value: https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/refs/heads/main/deploy/tasks/maven-deployment.yaml
167167

168-
169168
finally:
170169
- name: notification
171170
displayName: "Notify PNC driver"
@@ -187,7 +186,6 @@ spec:
187186
- name: JVM_BUILD_SERVICE_REQPROCESSOR_IMAGE
188187
description: Name of the processor image. Useful to override for development.
189188
type: string
190-
default: "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest"
191189
- name: NOTIFICATION_CONTEXT
192190
description: Notification context
193191
type: string
@@ -202,26 +200,3 @@ spec:
202200
- --context=$(params.NOTIFICATION_CONTEXT)
203201
- --status=$(params.STATUS)
204202
- --build-id=$(params.BUILD_ID)
205-
# script: |
206-
# #!/bin/bash
207-
# set -x
208-
# data=""
209-
# if [ $(params.STATUS) == "Failed" ]; then
210-
# echo "Looks like one or more tasks returned failure!"
211-
# data={\"status\":\"$(params.STATUS)\"}
212-
# else
213-
# echo "Notify PNC on pipeline completion"
214-
# data={\"status\":\"$(params.STATUS)\"}
215-
# fi
216-
# echo "Send notification >>\n$data"
217-
# # curl -v -X POST -H "Content-Type: application/json" \
218-
# # -H "Authorization: Bearer $(params.ACCESS_TOKEN)" \
219-
# # --data $data \
220-
# echo "### context: $(params.NOTIFICATION_CONTEXT)"
221-
# /opt/jboss/container/java/run/run-java.sh $@
222-
223-
# taskRef:
224-
# resolver: http
225-
# params:
226-
# - name: url
227-
# value: https://raw.githubusercontent.com/rnc/jvm-build-service/refs/heads/BR3/deploy/tasks/notification.yaml

deploy/tasks/notification.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

deploy/tasks/pre-build.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,8 @@ spec:
120120
script: |
121121
set -x
122122
echo "IMAGE is $(params.IMAGE_URL)"
123-
ls -lR $HOME/.docker || true
124-
cat $HOME/.docker/config.json
123+
cat $HOME/.docker/config.json || true
125124
echo "Creating pre-build-image archive"
126-
select-oci-auth.sh $(params.IMAGE_URL)
127125
create-archive --store $(params.IMAGE_URL) $(results.PRE_BUILD_IMAGE_DIGEST.path)=$(workspaces.source.path)/source
128126
env:
129127
- name: IMAGE_URL

java-components/build-request-processor/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757

5858
<dependency>
5959
<groupId>org.jboss.pnc</groupId>
60-
<artifactId>konflux-build-driver</artifactId>
60+
<artifactId>pnc-api</artifactId>
61+
<version>3.0.0</version>
6162
</dependency>
6263

6364
<dependency>
@@ -127,6 +128,12 @@
127128
<artifactId>assertj-core</artifactId>
128129
<scope>test</scope>
129130
</dependency>
131+
<dependency>
132+
<groupId>org.projectlombok</groupId>
133+
<artifactId>lombok</artifactId>
134+
<version>1.18.34</version>
135+
<scope>provided</scope>
136+
</dependency>
130137
</dependencies>
131138
<build>
132139
<plugins>

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/EntryPoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import com.redhat.hacbs.container.deploy.CopyArtifactsCommand;
1212
import com.redhat.hacbs.container.deploy.DeployCommand;
1313
import com.redhat.hacbs.container.deploy.DeployPreBuildSourceCommand;
14-
import com.redhat.hacbs.container.verifier.VerifyBuiltArtifactsCommand;
1514
import com.redhat.hacbs.container.notification.NotifyCommand;
15+
import com.redhat.hacbs.container.verifier.VerifyBuiltArtifactsCommand;
1616

1717
import io.quarkus.picocli.runtime.annotations.TopCommand;
1818
import picocli.CommandLine;

0 commit comments

Comments
 (0)