From 9a8cf489fd05a5d7f37c52c493c400ad9b9ba346 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Wed, 3 Oct 2018 18:03:56 +0200 Subject: [PATCH] openshift-ansible: make sure RPM building code is consistent --- .../openshift-ansible/openshift-openshift-ansible-master.yaml | 2 +- .../openshift-openshift-ansible-release-3.10.yaml | 2 +- .../openshift-openshift-ansible-release-3.11.yaml | 2 +- 3 files changed, 3 insertions(+), 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 index d7ab99e9b0fc..349725c443c9 100644 --- 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 index 03214af4c8fe..50835f2859cc 100644 --- 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 index 2900b98217c0..def2d4417a86 100644 --- 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