Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cachi2 output image #768

Merged
merged 3 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tekton/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
- name: revision
value: "{{revision}}"
- name: output-image
value: "quay.io/redhat-appstudio/pull-request-builds:rhtap-build-cachi2-{{revision}}"
value: "quay.io/konflux-ci/pull-request-builds:cachi2-build-{{revision}}"
- name: dockerfile
value: Containerfile
pipelineRef:
Expand Down
2 changes: 1 addition & 1 deletion .tekton/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: revision
value: "{{revision}}"
- name: output-image
value: "quay.io/redhat-appstudio/cachi2:{{revision}}"
value: "quay.io/konflux-ci/cachi2:{{revision}}"
- name: dockerfile
value: Containerfile
- name: slack-webhook-notification-team
Expand Down
6 changes: 3 additions & 3 deletions .tekton/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ spec:
set -eufx

version=$(cat $(results.version.path))
skopeo copy docker://quay.io/redhat-appstudio/cachi2:$PARAM_REVISION \
docker://quay.io/redhat-appstudio/cachi2:$version
skopeo copy docker://quay.io/konflux-ci/cachi2:$PARAM_REVISION \
docker://quay.io/konflux-ci/cachi2:$version

finally:
- name: slack-webhook-notification
Expand All @@ -104,7 +104,7 @@ spec:
- name: message
value: |-
Tekton pipelineRun $(context.pipelineRun.name) failed.
See https://console-openshift-console.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/k8s/ns/tekton-ci/tekton.dev~v1beta1~PipelineRun/$(context.pipelineRun.name)
See https://console-openshift-console.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/k8s/ns/konflux-ci/tekton.dev~v1~PipelineRun/$(context.pipelineRun.name)
(Quick! It may disappear soon!)
- name: key-name
value: $(params.slack-webhook-notification-team)
Expand Down
6 changes: 3 additions & 3 deletions .tekton/tag-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ spec:
image: registry.access.redhat.com/ubi9/skopeo:latest@sha256:23c9ed4af1f42614bdc56309452568b2110a67f23102f42f6a6582a63b63dcdb
script: |
#!/usr/bin/env bash
SRC_REF="quay.io/redhat-appstudio/cachi2:$(params.revision)"
TARGET_REF="quay.io/redhat-appstudio/cachi2:latest"
SRC_REF="quay.io/konflux-ci/cachi2:$(params.revision)"
TARGET_REF="quay.io/konflux-ci/cachi2:latest"

echo "Waiting until ${SRC_REF} is pushed"

Expand Down Expand Up @@ -66,7 +66,7 @@ spec:
- name: message
value: |-
Tekton pipelineRun $(context.pipelineRun.name) failed.
See https://console-openshift-console.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/k8s/ns/tekton-ci/tekton.dev~v1beta1~PipelineRun/$(context.pipelineRun.name)
See https://console-openshift-console.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/k8s/ns/konflux-ci/tekton.dev~v1~PipelineRun/$(context.pipelineRun.name)
(Quick! It may disappear soon!)
- name: key-name
value: $(params.slack-webhook-notification-team)
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ and DNF server with `tests/dnfserver/start.sh &` to speed up the tests.
To run integration-tests with custom image, specify the CACHI2\_IMAGE environment variable. Examples:

```shell
CACHI2_IMAGE=quay.io/redhat-appstudio/cachi2:{tag} nox -s integration-tests
CACHI2_IMAGE=quay.io/konflux-ci/cachi2:{tag} nox -s integration-tests
CACHI2_IMAGE=localhost/cachi2:latest nox -s integration-tests
```

Expand Down Expand Up @@ -272,10 +272,6 @@ tag follows the expected format: `$major.$minor.$patch`, without a `v` prefix).
should have built the image for that commit already. This is the "corresponding image" that receives
the new version tag. If the image for the tagged commit does not exist, the release pipeline will fail.*

You can watch the release pipeline in the [OpenShift console][ocp-cachi2-pipelines] in case it fails
(the pipeline is not visible anywhere in GitHub UI). For intermittent failures, retrying should be
possible from the OpenShift UI or by deleting and re-pushing the version tag.

*⚠ The release pipeline runs as soon as you push a tag into the repository. Do not push the new version
tag until you are ready to publish the release. You can use GitHub's ability to auto-create the tag
upon publishment.*
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Cachi2

[![coverage][cachi2-coverage-badge]][cachi2-coverage-status]
[![container][cachi2-container-status]][cachi2-container]
[![container][cachi2-container-badge]][cachi2-container-status]

Cachi2 is a CLI tool that pre-fetches your project's dependencies to aid in making your build process
[hermetic](https://slsa.dev/spec/v0.1/requirements#hermetic).
Expand Down Expand Up @@ -61,18 +61,18 @@ To install Cachi2 for local development, see the [development](#development) sec

### Container image

[![container][cachi2-container-status]][cachi2-container]
[![container][cachi2-container-badge]][cachi2-container-status]

```text
quay.io/redhat-appstudio/cachi2:latest
quay.io/konflux-ci/cachi2:latest
```

The container is re-built automatically on every merge to the main branch.

You may wish to set up an alias to make local usage more convenient:

```shell
alias cachi2='podman run --rm -ti -v "$PWD:$PWD:z" -w "$PWD" quay.io/redhat-appstudio/cachi2:latest'
alias cachi2='podman run --rm -ti -v "$PWD:$PWD:z" -w "$PWD" quay.io/konflux-ci/cachi2:latest'
```

Note that the alias mounts the current working directory - the container will have access to files in that directory
Expand Down Expand Up @@ -260,8 +260,10 @@ still in early development phase.

[cachi2-coverage-badge]: https://codecov.io/github/containerbuildsystem/cachi2/graph/badge.svg?token=VJKRTZQBMY
[cachi2-coverage-status]: https://codecov.io/github/containerbuildsystem/cachi2
[cachi2-container]: https://quay.io/repository/redhat-appstudio/cachi2
[cachi2-container-status]: https://quay.io/repository/redhat-appstudio/cachi2/status

[cachi2-container-badge]: https://img.shields.io/badge/container-latest-blue
[cachi2-container-status]: https://quay.io/repository/konflux-ci/cachi2/tag/latest

[cachi2-releases]: https://github.com/containerbuildsystem/cachi2/releases
[sdist-spec]: https://packaging.python.org/en/latest/specifications/source-distribution-format/
[wheel-spec]: https://packaging.python.org/en/latest/specifications/binary-distribution-format/
Expand All @@ -270,4 +272,3 @@ still in early development phase.
[go118-changelog]: https://tip.golang.org/doc/go1.18#go-command
[go119-changelog]: https://tip.golang.org/doc/go1.19#go-command
[go121-changelog]: https://tip.golang.org/doc/go1.21
[ocp-cachi2-pipelines]: https://console-openshift-console.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/pipelines/ns/tekton-ci/pipeline-runs?name=cachi2
Loading