Skip to content

Add an e2e-openstack job #1824

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 26, 2018
Merged

Add an e2e-openstack job #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ci-operator/config/openshift/installer/openshift-installer-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,8 @@ tests:
run-tests
openshift_installer:
cluster_profile: aws
- as: e2e-openstack
commands: TEST_FOCUS='Secrets should be consumable from pods in volume with defaultMode
set' run-tests
openshift_installer:
cluster_profile: openstack
58 changes: 58 additions & 0 deletions ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,64 @@ presubmits:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
trigger: ((?m)^/test( all| e2e-aws-all),?(\s+|$))
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/e2e-openstack
decorate: true
name: pull-ci-openshift-installer-master-e2e-openstack
optional: true
rerun_command: /test e2e-openstack
skip_cloning: true
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-openstack-cluster-profile
- --target=e2e-openstack
- --template=/usr/local/e2e-openstack
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: openstack
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-installer-master.yaml
name: ci-operator-configs
- name: JOB_NAME_SAFE
value: e2e-openstack
- name: TEST_COMMAND
value: TEST_FOCUS='Secrets should be consumable from pods in volume with
defaultMode set' run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
limits:
cpu: 500m
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-e2e.yaml
Copy link
Contributor

@stevekuznetsov stevekuznetsov Oct 12, 2018

Choose a reason for hiding this comment

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

@bbguimaraes do we generate this one?

Copy link
Contributor

@bbguimaraes bbguimaraes Oct 12, 2018

Choose a reason for hiding this comment

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

The template, yes, but not the profile (which doesn't seem to exist).

Copy link
Contributor

@stevekuznetsov stevekuznetsov Oct 12, 2018

Choose a reason for hiding this comment

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

OK, can you help @flaper87 use the generator here

Copy link
Contributor Author

@flaper87 flaper87 Oct 12, 2018

Choose a reason for hiding this comment

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

@stevekuznetsov any points on how to use the generator? As I mentioned in the PR description, I'll need some guidance as I'm new to the community and the infrastructure.

thanks a bunch for your reviews! 👍

Copy link
Contributor Author

@flaper87 flaper87 Oct 12, 2018

Choose a reason for hiding this comment

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

I ran ./hack/update-generated-config.sh

serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-openstack
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
trigger: ((?m)^/test( all| e2e-openstack),?(\s+|$))
- agent: kubernetes
always_run: true
branches:
Expand Down
17 changes: 16 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ objects:
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_aws_rsa || true
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true
fi

mkdir -p /tmp/output
Expand Down Expand Up @@ -234,11 +237,23 @@ objects:
- name: OPENSHIFT_INSTALL_PULL_SECRET_PATH
value: /etc/openshift-installer/pull-secret
- name: OPENSHIFT_INSTALL_PLATFORM
value: aws
value: ${CLUSTER_TYPE}
- name: OPENSHIFT_INSTALL_AWS_REGION
value: us-east-1
- name: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
value: ${RELEASE_IMAGE_LATEST}
- name: OPENSHIFT_INSTALL_OPENSTACK_IMAGE
value: rhcos
- name: OPENSHIFT_INSTALL_OPENSTACK_CLOUD
value: openstack-cloud
- name: OPENSHIFT_INSTALL_OPENSTACK_REGION
value: RegionOne
- name: OPENSHIFT_INSTALL_OPENSTACK_EXTERNAL_NETWORK
value: public
- name: OS_CLOUD
value: openstack-cloud
- name: OS_CLIENT_CONFIG_FILE
value: /etc/openshift-installer/clouds.yaml
command:
- /bin/sh
- -c
Expand Down