diff --git a/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main.yaml b/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main.yaml index 84b4ccacf7586..3b5e1efb05cf5 100644 --- a/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main.yaml +++ b/ci-operator/config/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main.yaml @@ -5,7 +5,10 @@ base_images: tag: base binary_build_commands: make build build_root: - from_repository: true + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.26-openshift-5.0 images: items: - build_args: @@ -26,6 +29,9 @@ images: dockerfile_path: scaler/Dockerfile from: base to: custom-metrics-autoscaler-http-add-on-scaler + - dockerfile_path: test/images/grpc-echo/Dockerfile + from: base + to: custom-metrics-autoscaler-http-add-on-grpc-echo promotion: to: - name: "5.0" @@ -48,6 +54,52 @@ resources: cpu: 100m memory: 200Mi test_binary_build_commands: make test +tests: +- as: lint + commands: GOFLAGS="" GOLANGCI_LINT_CACHE=/tmp/golangci-lint-cache make lint + container: + from: src + skip_if_only_changed: ^docs/|^\.github|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$ +- as: http-addon-e2e-aws + skip_if_only_changed: ^docs/|^\.github|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$ + steps: + cluster_profile: openshift-org-aws + post: + - as: e2e-clean + cli: latest + commands: GOFLAGS="" make e2e-test-openshift-clean + from: src + resources: + requests: + cpu: 100m + - chain: ipi-aws-post + - ref: send-results-to-reportportal + test: + - as: e2e-setup + cli: latest + commands: GOFLAGS="" make e2e-test-openshift-setup + dependencies: + - env: IMAGE_HTTP_ADDON_OPERATOR + name: custom-metrics-autoscaler-http-add-on-operator + - env: IMAGE_HTTP_ADDON_INTERCEPTOR + name: custom-metrics-autoscaler-http-add-on-interceptor + - env: IMAGE_HTTP_ADDON_SCALER + name: custom-metrics-autoscaler-http-add-on-scaler + from: src + resources: + requests: + cpu: 100m + - as: e2e-run + cli: latest + commands: make e2e-test-openshift + dependencies: + - env: IMAGE_GRPC_ECHO + name: custom-metrics-autoscaler-http-add-on-grpc-echo + from: src + resources: + requests: + cpu: 100m + workflow: ipi-aws zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-postsubmits.yaml b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-postsubmits.yaml index 78923691fdaac..9d15d14c28aec 100644 --- a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-postsubmits.yaml @@ -8,10 +8,10 @@ postsubmits: decorate: true decoration_config: sparse_checkout_files: - - .ci-operator.yaml - interceptor/Dockerfile - operator/Dockerfile - scaler/Dockerfile + - test/images/grpc-echo/Dockerfile labels: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen diff --git a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-presubmits.yaml b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-presubmits.yaml index 3c95ae51db5c0..8d48933d3b73d 100644 --- a/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/kedacore-http-add-on/openshift-kedacore-http-add-on-main-presubmits.yaml @@ -1,5 +1,92 @@ presubmits: openshift/kedacore-http-add-on: + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build06 + context: ci/prow/http-addon-e2e-aws + decorate: true + decoration_config: + sparse_checkout_files: + - interceptor/Dockerfile + - operator/Dockerfile + - scaler/Dockerfile + - test/images/grpc-echo/Dockerfile + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kedacore-http-add-on-main-http-addon-e2e-aws + rerun_command: /test http-addon-e2e-aws + skip_if_only_changed: ^docs/|^\.github|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$ + 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 + - --secret-dir=/secrets/ci-pull-credentials + - --target=http-addon-e2e-aws + 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/ci-pull-credentials + name: ci-pull-credentials + 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: ci-pull-credentials + secret: + secretName: ci-pull-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( | .* )http-addon-e2e-aws,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -10,10 +97,10 @@ presubmits: decorate: true decoration_config: sparse_checkout_files: - - .ci-operator.yaml - interceptor/Dockerfile - operator/Dockerfile - scaler/Dockerfile + - test/images/grpc-echo/Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -60,3 +147,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build04 + context: ci/prow/lint + decorate: true + decoration_config: + sparse_checkout_files: + - interceptor/Dockerfile + - operator/Dockerfile + - scaler/Dockerfile + - test/images/grpc-echo/Dockerfile + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-kedacore-http-add-on-main-lint + rerun_command: /test lint + skip_if_only_changed: ^docs/|^\.github|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=lint + 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: /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: 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( | .* )lint,?($|\s.*)