Skip to content

Commit

Permalink
pao: move master jobs to 4.12 and remove tests
Browse files Browse the repository at this point in the history
move master jobs to point to 4.12.
created 4.11 jobs for the new 4.11 pao upstream branch.
removed from master the following tests and related images:
e2e-gcp (for pao container and index images tests)
e2e-gcp-operator-upgrade
ci-ppc
e2e-render-cmd

all of the above are under cluster-node-tuning-operator.

Signed-off-by: Yanir Quinn <[email protected]>
  • Loading branch information
yanirq committed Nov 7, 2022
1 parent 9548766 commit a5c8ad1
Show file tree
Hide file tree
Showing 6 changed files with 629 additions and 405 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
base_images:
cli:
name: "4.11"
name: "4.12"
namespace: ocp
tag: cli
opm-builder:
Expand All @@ -20,16 +20,6 @@ build_root:
project_image:
dockerfile_path: openshift-ci/Dockerfile.tools
images:
- dockerfile_path: openshift-ci/Dockerfile.deploy
from: os
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build/_output/bin/performance-addon-operators
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build/_output/bin/performance-profile-creator
to: performance-addon-operator
- dockerfile_path: openshift-ci/Dockerfile.must-gather
from: os-min8
inputs:
Expand All @@ -38,24 +28,6 @@ images:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build/_output/bin/gather-sysinfo
to: performance-addon-operator-must-gather
- dockerfile_path: openshift-ci/Dockerfile.index-gen.ci
from: opm-builder
to: performance-addon-operator-index-gen
- dockerfile_path: openshift-ci/Dockerfile.index.ci
from: opm-builder
inputs:
performance-addon-operator-index-gen:
paths:
- destination_dir: .
source_path: /database/index.db
to: performance-addon-operator-index
- dockerfile_path: openshift-ci/Dockerfile.bundle.upstream.dev
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build
to: performance-addon-operator-bundle
- dockerfile_path: openshift-ci/Dockerfile.src.ci
from: src
inputs:
Expand All @@ -64,30 +36,17 @@ images:
- destination_dir: .
source_path: /usr/bin/oc
to: pao-src-oc
operator:
bundles:
- dockerfile_path: openshift-ci/Dockerfile.bundle.ci
- dockerfile_path: openshift-ci/Dockerfile.bundle-4.10.ci
substitutions:
- pullspec: REPLACE_IMAGE
with: performance-addon-operator
promotion:
excluded_images:
- performance-addon-operator-index-gen
- pao-src-oc
name: performance-addon-operator
namespace: ocp-kni
releases:
initial:
candidate:
product: ocp
stream: nightly
version: "4.11"
version: "4.12"
latest:
candidate:
product: ocp
stream: nightly
version: "4.11"
version: "4.12"
resources:
'*':
requests:
Expand All @@ -103,51 +62,6 @@ tests:
container:
from: pao-src-oc
optional: true
- as: ci-ppc
commands: make perf-profile-creator-tests
container:
from: src
optional: true
- as: e2e-render-cmd
commands: make render-command-tests
container:
from: src
- as: e2e-gcp
optional: true
steps:
cluster_profile: gcp
env:
OO_CHANNEL: "4.11"
OO_INSTALL_NAMESPACE: openshift-performance-addon-operator
OO_PACKAGE: performance-addon-operator
OO_TARGET_NAMESPACES: '!all'
test:
- as: e2e-test
commands: CLUSTER=mcp-only make cluster-deploy && make functests
from: pao-src-oc
resources:
requests:
cpu: 100m
memory: 200Mi
workflow: optional-operators-ci-gcp
- as: e2e-gcp-operator-upgrade
optional: true
steps:
cluster_profile: gcp
env:
OO_CHANNEL: "4.10"
OO_INSTALL_NAMESPACE: openshift-performance-addon-operator
OO_PACKAGE: performance-addon-operator
OO_TARGET_NAMESPACES: '!all'
test:
- as: e2e-test
commands: CLUSTER=ci-upgrade-test PERF_TEST_PROFILE=ci-upgrade-test make operator-upgrade-tests
from: pao-src-oc
resources:
requests:
cpu: 100m
memory: 200Mi
workflow: optional-operators-ci-gcp
zz_generated_metadata:
branch: master
org: openshift-kni
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
base_images:
cli:
name: "4.11"
namespace: ocp
tag: cli
opm-builder:
name: opm-builder
namespace: ci
tag: v1.14.3
os:
name: ubi
namespace: ocp
tag: "8"
os-min8:
name: ubi-minimal
namespace: ocp
tag: "8"
binary_build_commands: make build
build_root:
project_image:
dockerfile_path: openshift-ci/Dockerfile.tools
images:
- dockerfile_path: openshift-ci/Dockerfile.deploy
from: os
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build/_output/bin/performance-addon-operators
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build/_output/bin/performance-profile-creator
to: performance-addon-operator
- dockerfile_path: openshift-ci/Dockerfile.must-gather
from: os-min8
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build/_output/bin/gather-sysinfo
to: performance-addon-operator-must-gather
- dockerfile_path: openshift-ci/Dockerfile.index-gen.ci
from: opm-builder
to: performance-addon-operator-index-gen
- dockerfile_path: openshift-ci/Dockerfile.index.ci
from: opm-builder
inputs:
performance-addon-operator-index-gen:
paths:
- destination_dir: .
source_path: /database/index.db
to: performance-addon-operator-index
- dockerfile_path: openshift-ci/Dockerfile.bundle.upstream.dev
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/performance-addon-operators/build
to: performance-addon-operator-bundle
- dockerfile_path: openshift-ci/Dockerfile.src.ci
from: src
inputs:
cli:
paths:
- destination_dir: .
source_path: /usr/bin/oc
to: pao-src-oc
operator:
bundles:
- dockerfile_path: openshift-ci/Dockerfile.bundle.ci
- dockerfile_path: openshift-ci/Dockerfile.bundle-4.10.ci
substitutions:
- pullspec: REPLACE_IMAGE
with: performance-addon-operator
promotion:
excluded_images:
- performance-addon-operator-index-gen
- pao-src-oc
name: performance-addon-operator-4.11
namespace: ocp-kni
releases:
initial:
candidate:
product: ocp
stream: nightly
version: "4.11"
latest:
candidate:
product: ocp
stream: nightly
version: "4.11"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: ci
commands: make ci-job
container:
from: src
- as: ci-tools
commands: make ci-tools-job
container:
from: pao-src-oc
optional: true
- as: ci-ppc
commands: make perf-profile-creator-tests
container:
from: src
optional: true
- as: e2e-render-cmd
commands: make render-command-tests
container:
from: src
optional: true
- as: e2e-gcp
optional: true
steps:
cluster_profile: gcp
env:
OO_CHANNEL: "4.11"
OO_INSTALL_NAMESPACE: openshift-performance-addon-operator
OO_PACKAGE: performance-addon-operator
OO_TARGET_NAMESPACES: '!all'
test:
- as: e2e-test
commands: CLUSTER=mcp-only make cluster-deploy && make functests
from: pao-src-oc
resources:
requests:
cpu: 100m
memory: 200Mi
workflow: optional-operators-ci-gcp
- as: e2e-gcp-operator-upgrade
optional: true
steps:
cluster_profile: gcp
env:
OO_CHANNEL: "4.10"
OO_INSTALL_NAMESPACE: openshift-performance-addon-operator
OO_PACKAGE: performance-addon-operator
OO_TARGET_NAMESPACES: '!all'
test:
- as: e2e-test
commands: CLUSTER=ci-upgrade-test PERF_TEST_PROFILE=ci-upgrade-test make operator-upgrade-tests
from: pao-src-oc
resources:
requests:
cpu: 100m
memory: 200Mi
workflow: optional-operators-ci-gcp
zz_generated_metadata:
branch: release-4.11
org: openshift-kni
repo: performance-addon-operators
Loading

0 comments on commit a5c8ad1

Please sign in to comment.