Merge pull request #1799 from simonbaird/remove-some-appstudio-refs

Remove some appstudio refs
enterprise-contract · Jul 29, 2024 · a5f9215 · a5f9215
2 parents cfa9f24 + 4ba1a30
commit a5f9215
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/cmd/track/track_bundle_test.go b/cmd/track/track_bundle_test.go
@@ -184,11 +184,11 @@ func Test_TrackBundleCommand(t *testing.T) {
 			name: "tracking git references",
 			args: []string{
 				"--git",
-				"git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f",
+				"git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f",
 			},
 			expectStdout: true,
 			expectPrune:  true,
-			expectUrls:   []string{"git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f"},
+			expectUrls:   []string{"git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f"},
 		},
 	}
 

diff --git a/features/__snapshots__/track_bundle.snap b/features/__snapshots__/track_bundle.snap
@@ -54,7 +54,7 @@ trusted_tasks:
 [Track git references:stdout - 1]
 /-/-/-/
 trusted_tasks:
-  git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml:
+  git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml:
     - effective_on: "${TIMESTAMP}"
       ref: 3672a457e3e89c0591369f609eba727b8e84108f
 
@@ -67,7 +67,7 @@ trusted_tasks:
 [track tekton-task alias:stdout - 1]
 /-/-/-/
 trusted_tasks:
-  git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml:
+  git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml:
     - effective_on: "${TIMESTAMP}"
       ref: 3672a457e3e89c0591369f609eba727b8e84108f
   oci://${REGISTRY}/acceptance/bundle:tag:
@@ -96,7 +96,7 @@ trusted_tasks:
 [Track tekton-task alias:stdout - 1]
 /-/-/-/
 trusted_tasks:
-  git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml:
+  git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml:
     - effective_on: "${TIMESTAMP}"
       ref: 3672a457e3e89c0591369f609eba727b8e84108f
   oci://${REGISTRY}/acceptance/bundle:tag:

diff --git a/features/track_bundle.feature b/features/track_bundle.feature
@@ -95,14 +95,14 @@ Feature: track bundles
     Then the output should match the snapshot
 
   Scenario: Track git references
-    When ec command is run with "track bundle --git git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f"
+    When ec command is run with "track bundle --git git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f"
     Then the exit status should be 0
     Then the output should match the snapshot
 
   Scenario: Track tekton-task alias
     Given a tekton bundle image named "acceptance/bundle:tag" containing
       | Task     | task1     |
-    When ec command is run with "track tekton-task --bundle ${REGISTRY}/acceptance/bundle:tag --git git+https://github.com/redhat-appstudio/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f"
+    When ec command is run with "track tekton-task --bundle ${REGISTRY}/acceptance/bundle:tag --git git+https://github.com/konflux-ci/build-definitions.git//task/buildah/0.1/buildah.yaml@3672a457e3e89c0591369f609eba727b8e84108f"
     Then the exit status should be 0
     Then the output should match the snapshot
 

diff --git a/hack/bump-tekton-bundles.sh b/hack/bump-tekton-bundles.sh
@@ -23,7 +23,7 @@ set -o nounset
 
 root_dir=$(git rev-parse --show-toplevel)
 
-bundles="$(go run github.com/enterprise-contract/ec-cli inspect policy-data --source oci://quay.io/redhat-appstudio-tekton-catalog/data-acceptable-bundles)"
+bundles="$(go run github.com/enterprise-contract/ec-cli inspect policy-data --source oci::quay.io/konflux-ci/tekton-catalog/data-acceptable-bundles:latest)"
 
 for f in "${root_dir}"/.tekton/*-build.yaml; do
   # shellcheck disable=SC2016,SC2094

diff --git a/hack/cut-release.sh b/hack/cut-release.sh
@@ -137,6 +137,10 @@ not main, and not the konflux/references/release-v0.x branch used for PRs.
 
 $(nice_title Create a ReleasePlan record in the tenants config repo)
 
+Note: The tenants-config repo was retired. The ReleasePlans are in
+https://gitlab.cee.redhat.com/releng/konflux-release-data now. Todo: Update
+these instructions (https://issues.redhat.com/browse/EC-759).
+
 The goal is to make a PR similar to https://github.com/redhat-appstudio/tenants-config/pull/286
 or https://github.com/redhat-appstudio/tenants-config/pull/397 .
 Consider also if you want to remove older release plans. The new release plan should look

diff --git a/hack/simple-demo.sh b/hack/simple-demo.sh
@@ -17,11 +17,11 @@
 
 # This is an image regularly built in Konflux for testing purposes.
 # See https://github.com/enterprise-contract/golden-container
-IMAGE=${IMAGE:-"quay.io/redhat-appstudio/ec-golden-image:latest"}
+IMAGE=${IMAGE:-"quay.io/konflux-ci/ec-golden-image:latest"}
 
 # Assume the latest image was pushed already
 GIT_REPO=enterprise-contract/golden-container
-GIT_SHA=$(curl -s "https://api.github.com/repos/${GIT_REPO}/commits?per_page=1" | jq -r '.[0].sha')
+GIT_SHA=${GIT_SHA:-$(curl -s "https://api.github.com/repos/${GIT_REPO}/commits?per_page=1" | jq -r '.[0].sha')}
 
 # We can use `ec validate image --image $IMAGE` but to be more
 # realistic let's use the application snapshot format for the input.
@@ -64,7 +64,8 @@ POLICY_YAML=${POLICY_YAML:-"github.com/enterprise-contract/config//default"}
 #POLICY_YAML=${POLICY_YAML:-"github.com/enterprise-contract/config//redhat-no-hermetic"}
 #POLICY_YAML=${POLICY_YAML:-"./policy.yaml"}
 
-OUTPUT=${OUTPUT:-yaml}
+OUTPUT=${OUTPUT:-text}
+#OUTPUT=${OUTPUT:-yaml}
 
 MAIN_GO=$(git rev-parse --show-toplevel)/main.go