Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
"gcp-fips":{
"optional":true,
"prowJob":{"name":"canary-openshift-ocp-installer-e2e-gcp-fips-4.2"}
},
"openstack":{
"optional":true,
"prowJob":{"name":"canary-openshift-ocp-installer-e2e-openstack-4.2"}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1862,3 +1862,85 @@ periodics:
- name: pull-secret
secret:
secretName: ci-pull-credentials
- agent: kubernetes
cron: ""
decorate: true
decoration_config:
skip_cloning: true
labels:
job-type: launch
job-env: openstack
job-release: '4.2'
pj-rehearse.openshift.io/can-be-rehearsed: "true"
interval: 4h
name: canary-openshift-ocp-installer-e2e-openstack-4.2
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/pull-secret
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, the usual OpenStack presubmit only has the profile secret. I don't understand how that works, but it seems like it does. Maybe try to get closer to that template, or try to get @flaper87 to explain why he didn't need the pull-secret entry in #1824?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be related to the old "inline" nature of the secrets. I pushed this to align OpenStack with the latest attachements: #4823

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more observation would be what you said above applies to all the AWS jobs too. OpenStack is working in presubmit, yes! But it seems like the Canary jobs should align as well.

- --secret-dir=/usr/local/e2e-openstack-cluster-profile
- --target=e2e-openstack
- --template=/usr/local/e2e-openstack
- --input-hash=$(BUILD_ID)
- --input-hash=$(JOB_NAME)
command:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
value: registry.svc.ci.openshift.org/ocp/release:4.2
- name: BRANCH
value: "4.2"
- name: CLUSTER_TYPE
value: openstack
- name: CONFIG_SPEC
value: |
tag_specification:
name: "$(BRANCH)"
namespace: ocp
resources:
'*':
limits:
memory: 4Gi
requests:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-$(CLUSTER_TYPE)
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: "$(CLUSTER_TYPE)"
- name: JOB_NAME_SAFE
value: e2e-openstack
- name: KURYR_ENABLED
value: "false"
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-openstack-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-openstack
name: job-definition
subPath: cluster-launch-installer-openstack-e2e.yaml
- mountPath: /usr/local/pull-secret
name: pull-secret
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-openstack
- configMap:
name: prow-job-cluster-launch-installer-openstack-e2e
name: job-definition
- name: pull-secret
secret:
secretName: ci-pull-credentials