Merge pull request #2211 from rnc/DEPLOYMENT

Remove oras option modification

Author: rnc

deploy/tasks/pre-build.yaml

@@ -117,11 +117,8 @@ spec:
         - --git-reuse-repository=$(params.GIT_REUSE_REPOSITORY)
     - name: create-pre-build-image
       image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:81c4864dae6bb11595f657be887e205262e70086a05ed16ada827fd6391926ac
-      # The build-trusted-artifacts container doesn't handle REGISTRY_TOKEN but the actual .docker/config.json.
-      # Setting ORAS_OPTIONS to ensure the archive is compatible with jib (for OCIRepositoryClient) (to be removed)
       script: |
-        echo "Creating pre-build-image archive with ORAS_OPTIONS $ORAS_OPTIONS"
-        export ORAS_OPTIONS="$ORAS_OPTIONS --image-spec=v1.0 --artifact-type application/vnd.oci.image.config.v1+json"
+        echo "Creating pre-build-image archive"
         create-archive --store $(params.IMAGE_URL) $(results.PRE_BUILD_IMAGE_DIGEST.path)=$(workspaces.source.path)/source
       env:
         - name: IMAGE_URL

java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/services/RemoteRepositoryManager.java

@@ -65,7 +65,7 @@ void setup() throws URISyntaxException {
         var mavenUsername = config.getOptionalValue("maven.repository.username", String.class);
         var mavenPassword = config.getOptionalValue("maven.repository.password", String.class);
         if (mavenRepo.isPresent()) {
-            Log.infof("Using Maven Repository for rebuilt repository with {}", mavenRepo.get());
+            Log.infof("Using Maven Repository for rebuilt repository with %s", mavenRepo.get());
             //if we are deploying to a maven repo we use this by default
             Repository rebuiltRepo = new Repository("rebuilt",
                     mavenRepo.get(),
@@ -76,7 +76,7 @@ void setup() throws URISyntaxException {
             remoteStores.put("rebuilt", List.of(rebuiltCache));
 
         } else if (registryOwner.isPresent()) {
-            Log.infof("Using OCIRepositoryClient for rebuilt repository with owner {}", registryOwner.get());
+            Log.infof("Using OCIRepositoryClient for rebuilt repository with owner %s", registryOwner.get());
             var host = config.getOptionalValue("registry.host", String.class).orElse("quay.io");
             var port = config.getOptionalValue("registry.port", int.class).orElse(443);
             var token = config.getOptionalValue("registry" + TOKEN, String.class);
@@ -101,7 +101,7 @@ void setup() throws URISyntaxException {
             for (int i = 0; i < registries.length; i++) {
                 ImageRegistry registry = Util.parseRegistry(registries[i]);
                 String name = "shared-rebuilt-" + i;
-                Log.infof("Using shared registries for rebuilt repository with name {}", registries[i]);
+                Log.infof("Using shared registries for rebuilt repository with name %s", registries[i]);
 
                 Repository rebuiltRepo = new Repository(name,
                         "http" + (registry.getInsecure() ? "" : "s") + "://" +

pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go

@@ -47,7 +47,7 @@ type SystemConfigList struct {
 
 const (
 	KonfluxGitDefinition          = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
-	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
+	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/rnc/jvm-build-service/DEPLOYMENT/deploy/tasks/pre-build.yaml"
 	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
 	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
 )