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
6 changes: 3 additions & 3 deletions ci-operator/config/openshift/openshift-ansible/master.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"tag": "golang-1.10"
},

"rpm_build_commands": "tito tag --offline --accept-auto-changelog --use-release '9999%{?dist}'; tito build --output=\"_output/local/releases\" --rpm --test --offline --quiet; mv _output/local/releases/noarch/* _output/local/releases/",
"rpm_build_commands": "tito tag --offline --accept-auto-changelog --use-release '9999%{?dist}'; tito build --output=\"_output/local/releases\" --rpm --test --offline --quiet; mkdir _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms",
"test_binary_build_commands": "yum install -y gcc libffi-devel python-devel openssl-devel python-pip; pip install tox; chmod uga+w /etc/passwd",

"images": [
{
"from": "base",
"from": "rpms",
"to": "ansible",
"dockerfile_path": "images/installer/Dockerfile"
}
Expand All @@ -51,4 +51,4 @@
"limits": { "cpu": "2", "memory": "3Gi" }
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,67 @@ presubmits:
- configMap:
name: cluster-profile-gcp
trigger: ((?m)^/test( launch-gcp),?(\s+|$))
- agent: kubernetes
always_run: false
branches:
- master
- dockerless-build-temporary
context: ci/prow/aws
decorate: true
name: pull-ci-openshift-openshift-ansible-e2e-aws
rerun_command: /test aws
skip_cloning: true
spec:
containers:
- command:
- /bin/bash
- -c
- |
#!/bin/bash
set -e
export RPM_REPO_BASEURL="$( curl -q "${RPM_REPO_BASEURL_REF}" 2>/dev/null)"
ci-operator \
--artifact-dir=$(ARTIFACTS) \
--secret-dir=/usr/local/e2e-aws-cluster-profile \
--template=/usr/local/e2e-aws \
--target=e2e-aws \
--give-pr-author-access-to-namespace=true
env:
- name: TEST_FOCUS
value: Suite:openshift/conformance/parallel
- name: JOB_NAME_SAFE
value: e2e-aws
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: master.json
name: ci-operator-openshift-openshift-ansible
- name: RPM_REPO_BASEURL_REF
value: https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/.latest-rpms
image: ci-operator:latest
name: test
resources: {}
volumeMounts:
- mountPath: /usr/local/e2e-aws
name: job-definition
subPath: cluster-launch-e2e-openshift-ansible.yaml
- mountPath: /usr/local/e2e-aws-cluster-profile
name: cluster-profile
serviceAccountName: ci-operator
volumes:
- configMap:
name: prow-job-cluster-launch-e2e-openshift-ansible
name: job-definition
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: cluster-profile-aws
trigger: ((?m)^/test( all| aws),?(\s+|$))
- agent: jenkins
always_run: false
branches:
Expand Down
Loading