Upstream helm-charts and helm-charts-elastic have modified content

[Saul Wold]

Something seems to have changed with downloading github.com archive tarballs. The tarballs currently on the mirror contain the toplevel directory of helm-charts/ or helm-charts-elastic/, but if they are freshly downloaded the toplevel directory now contains or charts-92b6289ae93816717a8453cfe62bad51cbdb8ad0/ helm-charts-2bd7616ceddbdf2eee88965e2028ee37d304c79c/

This causes a build failure in monitor-armada-app then the RPM build happens and it tries to do the "%setup -n helm-charts" and gets the following error that rpmbuild can't change cd to the helm-charts directory.

I think the fix would be to use "%setup -n charts-%{sha}", it will also require coordination with updating the mirror with the newer tarball contents.

[Ghada Khalil (gkhalil)]

@Saul, Is this an issue specific to developer builds? I believe the nightly CENGN builds are successful.

[Saul Wold (sgw-starlingx)]

We investigated this and found that the tarball on CENGN is an older one and that this will affect developers if they don't download from the CENGN mirror as a source for those tarballs.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/702795

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/702795
Committed: https://git.openstack.org/cgit/starlingx/monitor-armada-app/commit/?id=3d8669b6e952b939fa22f2598dbc6f27584b1940
Submitter: Zuul
Branch: master

commit 3d8669b6e952b939fa22f2598dbc6f27584b1940
Author: Saul Wold <email address hidden>
Date: Wed Jan 15 20:52:42 2020 -0800

    Fix monitor-helm* specfiles for new tarballs

    Newer tarballs generated from github contain a different top-level
    directory than what are currently contained in the CENGN mirror cache.
    By parsing the first entry in the tarball we can figure out the
    proper directory.

    Tested by building both the new and old tarballs and verifing the
    RPM builds correctly and the log file has correct directory.

    Change-Id: Ie484cb2f5c615917afd320749ab3e68c8f7a8daa
    Closes-Bug: 1857049
    Signed-off-by: Saul Wold <email address hidden>

[Ghada Khalil (gkhalil)]

@Saul, since this LP is tagged for stx.4.0, please cherrypick the fix to the r/stx.4.0 branch

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: r/stx.4.0
Review: https://review.opendev.org/740555

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/740555
Committed: https://git.openstack.org/cgit/starlingx/monitor-armada-app/commit/?id=71d0c5bcba89e6f146e4ff7a3a90be881e1bf1f4
Submitter: Zuul
Branch: r/stx.4.0

commit 71d0c5bcba89e6f146e4ff7a3a90be881e1bf1f4
Author: Saul Wold <email address hidden>
Date: Wed Jan 15 20:52:42 2020 -0800

    Fix monitor-helm* specfiles for new tarballs

    Newer tarballs generated from github contain a different top-level
    directory than what are currently contained in the CENGN mirror cache.
    By parsing the first entry in the tarball we can figure out the
    proper directory.

    Tested by building both the new and old tarballs and verifing the
    RPM builds correctly and the log file has correct directory.

    Change-Id: Ie484cb2f5c615917afd320749ab3e68c8f7a8daa
    Closes-Bug: 1857049
    Signed-off-by: Saul Wold <email address hidden>
    (cherry picked from commit 3d8669b6e952b939fa22f2598dbc6f27584b1940)