Reviewed:  https://review.opendev.org/729808
Committed: https://git.openstack.org/cgit/starlingx/root/commit/?id=c2319db9d2a109936ba5ff366edac6f59b64ff6e
Submitter: Zuul
Branch:    f/centos8

commit 89543b25b4f2733968e4a17fbc6e791f4eaa25cd
Author: Don Penney <email address hidden>
Date:   Wed May 13 13:00:36 2020 -0400

    Add subdir PKG_GITREVCOUNT support
    
    This update introduces the PKG_GITREVCOUNT variable for package-based
    auto-versioning. Similar to GITREVCOUNT, PKG_GITREVCOUNT will
    calculate the number of commits in the corresponding package's
    directory. This allows each package within a git repo to be
    independently auto-versioned.
    
    Use of the PKG_BASE_SRCREV variable is optional. If it is not defined,
    the PKG_GITREVCOUNT will count all commits in the package directory.
    If it is defined, it will count a range of commits, with
    PKG_BASE_SRCREV as the starting point.
    
    To use this, include the following in the package's build_srpm.data
    file:
    TIS_PATCH_VER=PKG_GITREVCOUNT
    
    This can also be combined with GITREVCOUNT, if a package has local
    files in addition to an external repo to be factored in. This would
    add the count from PKG_GITREVCOUNT to GITREVCOUNT in calculating the
    TIS_PATCH_VER value:
    TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
    
    Change-Id: Iab3a8c8a212d292f26d5418a881de69566758134
    Story: 2006166
    Task: 39765
    Signed-off-by: Don Penney <email address hidden>

commit 3dcebf7b592d1c43a1f30ba7897e57f8fcade1ec
Author: Steven Webster <email address hidden>
Date:   Tue May 19 09:19:18 2020 -0400

    Uprev the SR-IOV device plugin to the latest version
    
    This is intended primarily to pick up support for SR-IOV
    accelerators.
    
    Testing has been performed as follows:
    
    System Types:
        AIO-SX, Standard
    Cluster network types:
        IPv4, IPv6
    NIC types:
        82599ES 10-Gigabit [10fb],
        MT27710 Family [ConnectX-4 Lx] [1015],
        X710 for 10GbE [1572]
    IPAM types:
        host-local,
        calico,
        dhcp,
        static
    Connectivity between pods:
        DPDK,
        netdevice
    
    Change-Id: Id0d5fcbfbf93ab581a07f26e375bcc2feee6bf69
    Story: 2006740
    Task: 39614
    Signed-off-by: Steven Webster <email address hidden>

commit a0e51f0cab911891376d4002a71b6161ce5edc44
Author: Dongqi Chen <email address hidden>
Date:   Wed May 13 17:00:12 2020 +0800

    Remove tpm from update-pxe-network-installer script
    
    Now use the kernel built-in tpmdd instead of tpmdd
    out-of-tree, so the rpm package is no longer provided.
    
    Change-Id: I0f322c81d1a9aa20b2ad43a8f5b7b17abfd5782a
    Story: 2007308
    Task: 39756
    Depends-On: https://review.opendev.org/#/c/726999/
    Signed-off-by: Dongqi Chen <email address hidden>

commit 89d38925cade03e5d724b0c7bf8ecf78dab2b830
Author: Dongqi Chen <email address hidden>
Date:   Mon May 11 09:37:28 2020 +0800

    [kernel-rt 4.18] Fix build-pkgs --rt --edit kernel error
    
    Extract commands from spec
    VERSION = 4.18.0
    ./generate_all_configs.sh kernel-rt
    
    When executing the script ‘./generate_all_configs.sh kernel-rt’,
    the config rename failed because the value of the variable ‘VERSION’
    could not be obtained.
    
    Change-Id: I39e203fdb1929667c78f6477e3369d527234343f
    Closes-Bug: #1877423
    Signed-off-by: Dongqi Chen <email address hidden>

commit eb971b6f7c8321064b3ca334e21f0609ffb70efe
Author: Scott Little <email address hidden>
Date:   Thu May 7 19:12:03 2020 -0400

    Fix potential infinite loop in build-iso
    
    Function generate_dep_list is creating a DEPLISTFILE
    with a lot of unwanted 'installing package xxx' messages
    when it should only contain a list of unresolved
    dependencies.
    
    On the next iteration we waste a lot of time trying to install
    nonexistant packages 'installing' and 'packages', and re-installing
    packages we already have.
    
    Instead of converging on an empty DEPLISTFILE, we converge
    on a DEPLISTFILE that just reiterates the same list of
    'installing package' if we are lucky, which we usually are,
    but not always.
    
    Closes-Bug: 1877483
    Change-Id: I971725558eb628c6d6b5d0b42d0bcab6b46e722b
    Signed-off-by: Scott Little <email address hidden>

commit 7a5616741a33c6f2ed13838c12196093a8411cf2
Author: Shuicheng Lin <email address hidden>
Date:   Sat May 2 22:40:02 2020 +0800

    Fix rt kernel always rebuild issue
    
    Several rt kernel rpms are disabled in spec, add them to
    unbuilt_rpm_patterns. Otherwise rebuild will be triggered
    due to missing of these rpms.
    
    Story: 2007308
    Task: 39618
    
    Change-Id: I06a56dd9d18f6873e316fbaaff752c70a33f14fd
    Signed-off-by: Shuicheng Lin <email address hidden>

commit f1213b1929689aeb27730cec2fbb44dcc837ba5e
Author: Shuicheng Lin <email address hidden>
Date:   Wed Mar 11 12:20:42 2020 +0800

    Update update-pxe-network-installer script for 4.18 kernel
    
    There are 5 rpms for kernel and kernel-modules built from 4.18
    kernel srpm.
    
    Story: 2007308
    Task: 39023
    Depends-On: https://review.opendev.org/720325
    
    Change-Id: I329cf421da0d90df60b2aa1aa5684322a80c4caf
    Signed-off-by: Shuicheng Lin <email address hidden>

commit fa6c30b29cf3f713379ab0f1fb089b91f0432056
Author: Joseph Richard <email address hidden>
Date:   Tue Apr 28 11:00:32 2020 -0400

    Add portieris-armada-app repo to gitignore
    
    Story: 2007348
    Task: 39588
    Change-Id: Ib4ea3cf42e5d761ede5554edeba1e5aa480436de
    Signed-off-by: Joseph Richard <email address hidden>

commit 1db0dd3126235518f625cfd599d10132c73adb5b
Author: Don Penney <email address hidden>
Date:   Tue Apr 21 11:54:42 2020 -0400

    Update stx-platformclients tag to stx.4.0-v1.1.0
    
    Change-Id: I6296971ea7b0539e331125e146ce83ae9a5a44a8
    Story: 2007518
    Task: 39513
    Signed-off-by: Don Penney <email address hidden>

commit 1a0484eecc2c0eab0dc05950469ef7c1723af48a
Author: Scott Little <email address hidden>
Date:   Mon Apr 20 11:09:24 2020 -0400

    find_chartfile returns multiple erroneous files
    
    find_chartfile can return multiple rpms, only one of
    which is correct.  e.g. When searching for package xxx,
    it will also return package xxx-yyy.
    
    Files match the GLOB need to validated vs that actual package
    name, and only the first match returned.
    
    Closes-Bug: 1873884
    Change-Id: Iedf514b37b73ec3c0d3518e0eb8e57750281aaec
    Signed-off-by: Scott Little <email address hidden>

commit 47bd110e24a7814c3c6a344cdb8aed9316565f03
Author: albailey <email address hidden>
Date:   Wed Apr 15 07:29:36 2020 -0500

    Cleanup .gitignore based on latest manifest entries
    
    There have been new repos added in stx/manifest that
    were not added to the .gitignore in this repo.
    This means that there would have been untracked changes
    when running:
    
    repo status
     --     stx/cert-manager-armada-app/
     --     stx/kernel/
     --     stx/nginx-ingress-controller-armada-app/
    
    Pertains to:
    https://review.opendev.org/#/c/718787/
    https://review.opendev.org/#/c/716117/
    
    Story: 2007360
    Task: 39426
    Change-Id: Ib55639735b181625fb4156f55d4b7814912f9132
    Signed-off-by: albailey <email address hidden>

commit e3460d7d11d0fda5420d71b22c3aad2e02901de7
Author: Scott Little <email address hidden>
Date:   Wed Mar 4 12:25:05 2020 -0500

    Enable build of docker images, charts and wheels from a layered build
    
    1) create merged wheels.inc file(s) as part of build-pkgs.
    These files can be published by CENGN layer builds, and
    be referenced by the 'container' layer build.
    
    2) get-stx-wheels.sh needs to find wheels.inc files from
    lower layer builds.  The will be fould under
    ${MY_REPO}/cgcs-centos-repo/layer_wheels_inc.
    
    3) build-helm-charts.sh must now also search for helm
    rpms under ${MY_REPO}/cgcs-centos-repo/Binary/noarch
    for chart packages built by lower layers.
    
    Story: 2006166
    Task: 38979
    Depends-On: https://review.opendev.org/711773
    Depends-On: https://review.opendev.org/711774
    Change-Id: I91650d3e1746a45c8ac118cca58e9b64f30c5b72
    Signed-off-by: Scott Little <email address hidden>

commit d06b9aa7639ad0267ed89234465551c12c0d0f9e
Author: Scott Little <email address hidden>
Date:   Wed Sep 25 14:27:40 2019 -0400

    Branch and tag tools converted from wrgit to repo
    
    Update branching and tagging tools, used by patching, to do things
    the 'repo' way.  Repo has replaced wrgit.
    
    This is complicated by ...
    
    1) Not all repos are under our control, and so can't be branched or
    tagged by us.  The tools now accepts arguments that list 'remotes' or
    'projects' to which branches or tags are to be applied
    
    2) The manifest requires an update to reference the new branch or tag
    as it applies to affected projects.  Non-affected projects can
    optionally be locked down by converting the revision to a sha.
    The tools must now try to generate that manifest.  It might be
    sub-optimal.  i.e. a revision is explicitly added to each project,
    rather than using the 'default' mechanism.  Perhaps something to address
    in a future update.
    
    ORIGINATING_BRANCH=master
    ORIGINATING_BUILD=20200220T023000Z
    NEW_BRANCH=r/stx.4.0
    STX_REMOTES="starlingx"
    
    repo init -u https://opendev.org/starlingx/manifest -b $ORIGINATING_BRANCH
    repo sync --force-sync
    
    curl http://mirror.starlingx.cengn.ca/mirror/starlingx/${ORIGINATING_BRANCH}/centos/${ORIGINATING_BUILD}/outputs/CONTEXT.sh > ${ORIGINATING_BUILD}.context
    
    source ${ORIGINATING_BUILD}.context
    create_branches_and_tags.sh --branch=$NEW_BRANCH --remotes=$STX_REMOTES --manifest --lockdown
    push_branches_tags.sh --branch=$NEW_BRANCH --remotes=$STX_REMOTES --manifest
    
    ORIGINATING_BRANCH=r/stx.4.0
    ORIGINATING_BUILD=20200220T023000Z
    NEW_STX_TAG=4.0.0
    NEW_GIT_HUB_TAG=stx.4.0.0
    STX_REMOTES="starlingx"
    GIT_HUB_REMOTES="stx-staging"
    
    repo init -u https://opendev.org/starlingx/manifest -b $ORIGINATING_BRANCH
    repo sync --force-sync
    
    curl http://mirror.starlingx.cengn.ca/mirror/starlingx/${ORIGINATING_BRANCH}/centos/${ORIGINATING_BUILD}/outputs/CONTEXT.sh > ${ORIGINATING_BUILD}.context
    
    source ${ORIGINATING_BUILD}.context
    TAG=TEST_19.10_PATCH_0000
    create_tags.sh --tag=$NEW_STX_TAG --remotes=$STX_REMOTES,$GIT_HUB_REMOTES --manifest --manifest-prefix=stx. --lock-down
    create_tags.sh --tag=$NEW_GIT_HUB_TAG --remotes=$GIT_HUB_REMOTES
    push_tags.sh --tag=$NEW_STX_TAG --remotes=$STX_REMOTES
    push_tags.sh --tag=$NEW_GIT_HUB_TAG --remotes=$STX_REMOTES
    cd .repo/manifests
    git mv $TAG-default.xml stx.$TAG.xml
    
    vi stx.$TAG.xml
       # set revision for all stx-staging projects to refs/tags/stx.4.0.0
       <project remote="stx-staging" ... revision="refs/tags/stx.4.0.0" .
    
    vi stx.$TAG.xml
       # set default revision
       <default remote="starlingx" revision="refs/tags/4.0.0"/>
    
       # delete 'revision' for all starlingx projects
    
    git add stx.$TAG.xml
    git commit -s --amend
        # set title to
        Locked down manifest for StarlingX $TAG
    
    git tag -d $TAG
    git review
    git tag -s -m "Tag $TAG" $TAG
    git push gerrit $TAG
    
    Change-Id: I5ac0c3e44ffda262edb416e877d46c9036cd6e92
    Signed-off-by: Scott Little <email address hidden>

commit 61ef1d4124ac858e71591f9c93200bf59a38ff5d
Author: Scott Little <email address hidden>
Date:   Mon Mar 30 09:55:26 2020 -0400

    Build avoidance for all build-type values
    
    Two improvements.
    
    1) Extend build avoidance to work with any build type,
    and built in any order.
    
    Previously build avoidance did not support build types other
    than 'std' and 'rt', and only supported thos properly
    if both 'std' and 'rt' are built at the same time.
    
    2) Allow for a build avoidance config that does not specify
    a host.  In this mode the reference build must be on the same
    machine.  The envisioned use case is to allow a build server
    to use build avoidance internally for faster builds, without
    potentially exposing an rsync port on the network.
    
    Story: 2006166
    Task: 39207
    Signed-off-by: Scott Little <email address hidden>
    Change-Id: Idbd87bcc7683746d7b2ff8ac7488919c4a406b50

commit 9afe34c3f9868dde3d638d57e87535c74e35f0d5
Author: Shuicheng Lin <email address hidden>
Date:   Wed Mar 11 09:15:13 2020 +0800

    Remove rdma since it is replaced by rdma-core
    
    rdma function is provided by rdma-core now. Although rdma is
    included in ISO, it is not installed due to obsoleted by rdma-core.
    Remove the rdma package from ISO, otherwise, CentOS 8 installer will
    report conflict issue as rdma-core obsoletes rdma.
    
    Story: 2007308
    Task: 39022
    
    Change-Id: I3f5bc2466f65964c27371a3d93d36218bd11cb02
    Signed-off-by: Shuicheng Lin <email address hidden>