diff --git a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.3.yaml b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.3.yaml new file mode 100644 index 0000000000000..6c03a4b1e0508 --- /dev/null +++ b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.3.yaml @@ -0,0 +1,27 @@ +build_root: + image_stream_tag: + name: builder + namespace: konveyor + tag: ubi9-v1.26 +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: build + steps: + test: + - as: build + commands: go build ./... + from: src + resources: + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: oadp-1.3 + org: migtools + repo: kopia diff --git a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.4.yaml b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.4.yaml new file mode 100644 index 0000000000000..4f2d9d2ed2641 --- /dev/null +++ b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.4.yaml @@ -0,0 +1,27 @@ +build_root: + image_stream_tag: + name: builder + namespace: konveyor + tag: ubi9-v1.26 +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: build + steps: + test: + - as: build + commands: go build ./... + from: src + resources: + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: oadp-1.4 + org: migtools + repo: kopia diff --git a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.5.yaml b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.5.yaml new file mode 100644 index 0000000000000..c7fe3c161bebf --- /dev/null +++ b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.5.yaml @@ -0,0 +1,27 @@ +build_root: + image_stream_tag: + name: builder + namespace: konveyor + tag: ubi9-v1.26 +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: build + steps: + test: + - as: build + commands: go build ./... + from: src + resources: + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: oadp-1.5 + org: migtools + repo: kopia diff --git a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.5__periodics.yaml b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.5__periodics.yaml deleted file mode 100644 index 7154473c2090e..0000000000000 --- a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.5__periodics.yaml +++ /dev/null @@ -1,50 +0,0 @@ -base_images: - rebasebot: - name: rebasebot - namespace: ci - tag: latest -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: rebasebot - cron: 0 1 * * Mon - steps: - test: - - as: rebasebot - commands: | - source <(curl --silent https://raw.githubusercontent.com/oadp-rebasebot/oadp-rebase/refs/heads/oadp-dev/rebase-configs/migtools_kopia_oadp-1.5.env.sh) - rebasebot --source "$SOURCE_UPSTREAM_REPO" \ - --dest "$DESTINATION_DOWNSTREAM_REPO" \ - --rebase "$REBASE_REPO" \ - --github-app-id 1810299 \ - --github-cloner-id 1810272 \ - --github-app-key /secrets/oadp-rebase-bot/oadp-rebasebot-app-key \ - --github-cloner-key /secrets/oadp-rebase-bot/oadp-rebasebot-cloner-key \ - --git-username oadp-team-rebase-bot \ - --git-email oadp-maintainers@redhat.com \ - ${HOOK_SCRIPTS:+$HOOK_SCRIPTS} \ - ${EXTRA_REBASEBOT_ARGS:+$EXTRA_REBASEBOT_ARGS} - credentials: - - mount_path: /secrets/oadp-rebase-bot - name: oadp-team-rebasebot-credentials - namespace: test-credentials - from_image: - name: rebasebot - namespace: ci - tag: latest - resources: - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: oadp-1.5 - org: migtools - repo: kopia - variant: periodics diff --git a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.6.yaml b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.6.yaml new file mode 100644 index 0000000000000..28fda9a5d42ca --- /dev/null +++ b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-1.6.yaml @@ -0,0 +1,27 @@ +build_root: + image_stream_tag: + name: builder + namespace: konveyor + tag: ubi9-v1.26 +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: build + steps: + test: + - as: build + commands: go build ./... + from: src + resources: + requests: + cpu: 100m + memory: 200Mi +zz_generated_metadata: + branch: oadp-1.6 + org: migtools + repo: kopia diff --git a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-dev__periodics.yaml b/ci-operator/config/migtools/kopia/migtools-kopia-oadp-dev__periodics.yaml deleted file mode 100644 index 63bce25de2b91..0000000000000 --- a/ci-operator/config/migtools/kopia/migtools-kopia-oadp-dev__periodics.yaml +++ /dev/null @@ -1,50 +0,0 @@ -base_images: - rebasebot: - name: rebasebot - namespace: ci - tag: latest -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: rebasebot - cron: 0 1 * * Mon,Wed,Fri - steps: - test: - - as: rebasebot - commands: | - source <(curl --silent https://raw.githubusercontent.com/oadp-rebasebot/oadp-rebase/refs/heads/oadp-dev/rebase-configs/migtools_kopia_oadp-dev.env.sh) - rebasebot --source "$SOURCE_UPSTREAM_REPO" \ - --dest "$DESTINATION_DOWNSTREAM_REPO" \ - --rebase "$REBASE_REPO" \ - --github-app-id 1810299 \ - --github-cloner-id 1810272 \ - --github-app-key /secrets/oadp-rebase-bot/oadp-rebasebot-app-key \ - --github-cloner-key /secrets/oadp-rebase-bot/oadp-rebasebot-cloner-key \ - --git-username oadp-team-rebase-bot \ - --git-email oadp-maintainers@redhat.com \ - ${HOOK_SCRIPTS:+$HOOK_SCRIPTS} \ - ${EXTRA_REBASEBOT_ARGS:+$EXTRA_REBASEBOT_ARGS} - credentials: - - mount_path: /secrets/oadp-rebase-bot - name: oadp-team-rebasebot-credentials - namespace: test-credentials - from_image: - name: rebasebot - namespace: ci - tag: latest - resources: - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: oadp-dev - org: migtools - repo: kopia - variant: periodics diff --git a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.3-presubmits.yaml b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.3-presubmits.yaml new file mode 100644 index 0000000000000..087204b6c7d7d --- /dev/null +++ b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.3-presubmits.yaml @@ -0,0 +1,75 @@ +presubmits: + migtools/kopia: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.3$ + - ^oadp-1\.3- + cluster: build01 + context: ci/prow/build + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-migtools-kopia-oadp-1.3-build + rerun_command: /test build + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --target=build + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )build,?($|\s.*) diff --git a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.4-presubmits.yaml b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.4-presubmits.yaml new file mode 100644 index 0000000000000..6c1984e7ea787 --- /dev/null +++ b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.4-presubmits.yaml @@ -0,0 +1,75 @@ +presubmits: + migtools/kopia: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.4$ + - ^oadp-1\.4- + cluster: build01 + context: ci/prow/build + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-migtools-kopia-oadp-1.4-build + rerun_command: /test build + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --target=build + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )build,?($|\s.*) diff --git a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.5-periodics.yaml b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.5-periodics.yaml deleted file mode 100644 index b98f54717cf65..0000000000000 --- a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.5-periodics.yaml +++ /dev/null @@ -1,74 +0,0 @@ -periodics: -- agent: kubernetes - cluster: build02 - cron: 0 1 * * Mon - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-1.5 - org: migtools - repo: kopia - labels: - ci-operator.openshift.io/variant: periodics - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-migtools-kopia-oadp-1.5-periodics-rebasebot - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --target=rebasebot - - --variant=periodics - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.5-presubmits.yaml b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.5-presubmits.yaml new file mode 100644 index 0000000000000..efeda51fdf41b --- /dev/null +++ b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.5-presubmits.yaml @@ -0,0 +1,75 @@ +presubmits: + migtools/kopia: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.5$ + - ^oadp-1\.5- + cluster: build01 + context: ci/prow/build + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-migtools-kopia-oadp-1.5-build + rerun_command: /test build + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --target=build + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )build,?($|\s.*) diff --git a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.6-presubmits.yaml b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.6-presubmits.yaml new file mode 100644 index 0000000000000..feb3855887fc8 --- /dev/null +++ b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-1.6-presubmits.yaml @@ -0,0 +1,75 @@ +presubmits: + migtools/kopia: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.6$ + - ^oadp-1\.6- + cluster: build01 + context: ci/prow/build + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-migtools-kopia-oadp-1.6-build + rerun_command: /test build + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --target=build + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )build,?($|\s.*) diff --git a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-dev-periodics.yaml b/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-dev-periodics.yaml deleted file mode 100644 index 6135abab9c8c4..0000000000000 --- a/ci-operator/jobs/migtools/kopia/migtools-kopia-oadp-dev-periodics.yaml +++ /dev/null @@ -1,74 +0,0 @@ -periodics: -- agent: kubernetes - cluster: build02 - cron: 0 1 * * Mon,Wed,Fri - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: oadp-dev - org: migtools - repo: kopia - labels: - ci-operator.openshift.io/variant: periodics - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-migtools-kopia-oadp-dev-periodics-rebasebot - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --target=rebasebot - - --variant=periodics - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/core-services/prow/02_config/migtools/kopia/_prowconfig.yaml b/core-services/prow/02_config/migtools/kopia/_prowconfig.yaml index 3468db18a5c91..f169efa427500 100644 --- a/core-services/prow/02_config/migtools/kopia/_prowconfig.yaml +++ b/core-services/prow/02_config/migtools/kopia/_prowconfig.yaml @@ -16,6 +16,7 @@ branch-protection: tide: queries: - includedBranches: + - oadp-1.3 - oadp-1.4 - oadp-1.5 - oadp-1.6