Skip to content

Commit

Permalink
Merge pull request #934 from rnc/STONEBLD1638
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnc
rnc authored Nov 23, 2023
2 parents a674dd3 + 6775915 commit 011a4af
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 419 deletions.
133 changes: 0 additions & 133 deletions deploy/crds/base/jvmbuildservice.io_dependencybuilds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,76 +270,10 @@ spec:
type: string
type: object
type: array
currentBuildRecipe:
description: BuildRecipe the current build recipe. If build is done
then this recipe was used to get to the current state Deprecated
properties:
additionalDownloads:
items:
properties:
binaryPath:
type: string
fileName:
type: string
packageName:
type: string
sha256:
type: string
type:
type: string
uri:
type: string
required:
- type
type: object
type: array
additionalMemory:
type: integer
allowedDifferences:
items:
type: string
type: array
commandLine:
items:
type: string
type: array
disableSubmodules:
type: boolean
enforceVersion:
type: string
image:
type: string
javaVersion:
type: string
pipeline:
description: Deprecated
type: string
postBuildScript:
type: string
preBuildScript:
type: string
repositories:
items:
type: string
type: array
tool:
type: string
toolVersion:
type: string
toolVersions:
additionalProperties:
type: string
type: object
type: object
deployedArtifacts:
items:
type: string
type: array
diagnosticDockerFiles:
description: Deprecated
items:
type: string
type: array
discoveryPipelineResults:
description: A representation of the Tekton Results records for a
pipeline
Expand All @@ -351,77 +285,10 @@ spec:
result:
type: string
type: object
failedBuildRecipes:
description: FailedBuildRecipes recipes that resulted in a failure
if the current state is failed this may include the current BuildRecipe
Deprecated
items:
properties:
additionalDownloads:
items:
properties:
binaryPath:
type: string
fileName:
type: string
packageName:
type: string
sha256:
type: string
type:
type: string
uri:
type: string
required:
- type
type: object
type: array
additionalMemory:
type: integer
allowedDifferences:
items:
type: string
type: array
commandLine:
items:
type: string
type: array
disableSubmodules:
type: boolean
enforceVersion:
type: string
image:
type: string
javaVersion:
type: string
pipeline:
description: Deprecated
type: string
postBuildScript:
type: string
preBuildScript:
type: string
repositories:
items:
type: string
type: array
tool:
type: string
toolVersion:
type: string
toolVersions:
additionalProperties:
type: string
type: object
type: object
type: array
failedVerification:
type: boolean
hermetic:
type: boolean
lastCompletedBuildPipelineRun:
description: Deprecated
type: string
message:
type: string
pipelineRetries:
Expand Down
14 changes: 0 additions & 14 deletions deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ spec:
type: object
hermeticBuilds:
type: string
host:
type: string
insecure:
type: boolean
mavenBaseLocations:
additionalProperties:
type: string
Expand All @@ -111,12 +107,6 @@ spec:
username:
type: string
type: object
owner:
type: string
port:
type: string
prependTag:
type: string
registry:
properties:
host:
Expand Down Expand Up @@ -167,15 +157,11 @@ spec:
- relocationPattern
type: object
type: array
repository:
type: string
requireArtifactVerification:
description: If this is true then the build will fail if artifact
verification fails otherwise deploy will happen as normal, but a
field will be set on the DependencyBuild
type: boolean
secretName:
type: string
sharedRegistries:
items:
properties:
Expand Down
5 changes: 2 additions & 3 deletions ...lyser-tool/src/main/java/com/redhat/hacbs/analyser/kube/ResetDependencyBuildsCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.redhat.hacbs.analyser.kube;

import java.util.Collections;
import java.util.List;

import jakarta.inject.Inject;
Expand Down Expand Up @@ -33,14 +32,14 @@ public void run() {
if (!build.isEmpty()) {
DependencyBuild item = client.withName(build).get();
item.getStatus().setState("");
item.getStatus().setFailedBuildRecipes(Collections.emptyList());
// item.getStatus().setFailedBuildRecipes(Collections.emptyList());
client.updateStatus(item);
} else {
List<DependencyBuild> items = client.list().getItems();
for (var request : items) {
if (!failedOnly || request.getStatus().getState().equals("DependencyBuildStateFailed")) {
request.getStatus().setState("");
request.getStatus().setFailedBuildRecipes(Collections.emptyList());
// request.getStatus().setFailedBuildRecipes(Collections.emptyList());
client.updateStatus(request);
}
}
Expand Down
133 changes: 0 additions & 133 deletions ...omponents/resource-model/src/main/resources/crds/jvmbuildservice.io_dependencybuilds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,76 +270,10 @@ spec:
type: string
type: object
type: array
currentBuildRecipe:
description: BuildRecipe the current build recipe. If build is done
then this recipe was used to get to the current state Deprecated
properties:
additionalDownloads:
items:
properties:
binaryPath:
type: string
fileName:
type: string
packageName:
type: string
sha256:
type: string
type:
type: string
uri:
type: string
required:
- type
type: object
type: array
additionalMemory:
type: integer
allowedDifferences:
items:
type: string
type: array
commandLine:
items:
type: string
type: array
disableSubmodules:
type: boolean
enforceVersion:
type: string
image:
type: string
javaVersion:
type: string
pipeline:
description: Deprecated
type: string
postBuildScript:
type: string
preBuildScript:
type: string
repositories:
items:
type: string
type: array
tool:
type: string
toolVersion:
type: string
toolVersions:
additionalProperties:
type: string
type: object
type: object
deployedArtifacts:
items:
type: string
type: array
diagnosticDockerFiles:
description: Deprecated
items:
type: string
type: array
discoveryPipelineResults:
description: A representation of the Tekton Results records for a
pipeline
Expand All @@ -351,77 +285,10 @@ spec:
result:
type: string
type: object
failedBuildRecipes:
description: FailedBuildRecipes recipes that resulted in a failure
if the current state is failed this may include the current BuildRecipe
Deprecated
items:
properties:
additionalDownloads:
items:
properties:
binaryPath:
type: string
fileName:
type: string
packageName:
type: string
sha256:
type: string
type:
type: string
uri:
type: string
required:
- type
type: object
type: array
additionalMemory:
type: integer
allowedDifferences:
items:
type: string
type: array
commandLine:
items:
type: string
type: array
disableSubmodules:
type: boolean
enforceVersion:
type: string
image:
type: string
javaVersion:
type: string
pipeline:
description: Deprecated
type: string
postBuildScript:
type: string
preBuildScript:
type: string
repositories:
items:
type: string
type: array
tool:
type: string
toolVersion:
type: string
toolVersions:
additionalProperties:
type: string
type: object
type: object
type: array
failedVerification:
type: boolean
hermetic:
type: boolean
lastCompletedBuildPipelineRun:
description: Deprecated
type: string
message:
type: string
pipelineRetries:
Expand Down
Loading

0 comments on commit 011a4af

Please sign in to comment.