Merge pull request openshift#1800 from vrutkovs/oa-release-3.11-build

openshift-ansible: make sure RPM building code is consistent
wking · Oct 3, 2018 · f292297 · f292297
2 parents a067f58 + 9a8cf48
commit f292297
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml
@@ -23,7 +23,7 @@ resources:
     requests:
       cpu: '1'
       memory: 1.5Gi
-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; createrepo _output/local/releases/rpms
+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; createrepo _output/local/releases
 tag_specification:
   cluster: https://api.ci.openshift.org
   name: origin-v4.0

diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10.yaml
@@ -25,7 +25,7 @@ resources:
       memory: 1.5Gi
 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/; createrepo _output/local/releases/rpms
+  _output/local/releases/noarch/* _output/local/releases/; createrepo _output/local/releases
 tag_specification:
   cluster: https://api.ci.openshift.org
   name: origin-v3.10

diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11.yaml
@@ -25,7 +25,7 @@ resources:
       memory: 1.5Gi
 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/; createrepo _output/local/releases/rpms
+  _output/local/releases/noarch/* _output/local/releases/; createrepo _output/local/releases
 tag_specification:
   cluster: https://api.ci.openshift.org
   name: origin-v3.11