Preparation for osh-infra merger

Change-Id: I56bc5aa13fdef5d3d297ebf2738bff35f66274b5
2025-03-19 20:33:29 +00:00
parent 8218af4fb5
commit 6228fadc45
24 changed files with 94 additions and 752 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -163,11 +163,10 @@
    name: treasuremap-airskiff-infra-deploy
    abstract: true
    roles:
-      - zuul: openstack/openstack-helm-infra
+      - zuul: openstack/openstack-helm
      - zuul: zuul/zuul-jobs
    required-projects:
      - openstack/openstack-helm
-      - openstack/openstack-helm-infra
      - openstack/openstack-helm-plugin
    irrelevant-files:
      - ^.*\.rst$
@@ -203,8 +202,8 @@
      loopback_device: /dev/loop100
      loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
      ceph_osd_data_device: /dev/loop100
-      kube_version_repo: "v1.31"
-      kube_version: "1.31.3-1.1"
+      kube_version_repo: "v1.32"
+      kube_version: "1.32.1-1.1"
      calico_setup: true
      calico_version: "v3.27.4"
      cilium_setup: false
@@ -215,8 +214,8 @@
      metallb_version: "0.13.12"
      helm_version: "v3.14.0"
      crictl_version: "v1.30.1"
-      zuul_osh_infra_relative_path: ../openstack-helm-infra
-      gate_scripts_relative_path: ../openstack-helm-infra
+      zuul_osh_infra_relative_path: ../openstack-helm
+      gate_scripts_relative_path: ../openstack-helm
      run_helm_tests: "no"

 - job:
@@ -230,9 +229,9 @@
    vars:
      site: airskiff
      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
-      HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
      gate_scripts_relative_path: .
      gate_scripts:
        - ./tools/deployment/airskiff/developer/000-prepare-k8s.sh
@@ -260,9 +259,9 @@
    vars:
      site: airskiff
      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
-      HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
      DISTRO: ubuntu_jammy
      gate_scripts_relative_path: .
      gate_scripts:
@@ -294,9 +293,9 @@
    vars:
      site: airskiff
      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
-      HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
      USE_ARMADA_GO: true
      gate_scripts_relative_path: .
      gate_scripts:
--- a/doc/source/airsloop.rst
+++ b/doc/source/airsloop.rst
@@ -311,106 +311,58 @@ Under site/airsloop/software/config/ create a versions.yaml file in the followin
        kubernetes:
          apiserver:
            proxy_server: proxy.example.com:8080
-          apiserver-htk:
-            proxy_server: proxy.example.com:8080
          calico:
            calico:
              proxy_server: proxy.example.com:8080
-            calico-htk:
-              proxy_server: proxy.example.com:8080
            etcd:
              proxy_server: proxy.example.com:8080
-            etcd-htk:
-              proxy_server: proxy.example.com:8080
          controller-manager:
            proxy_server: proxy.example.com:8080
-          controller-manager-htk:
-            proxy_server: proxy.example.com:8080
          coredns:
            proxy_server: proxy.example.com:8080
-          coredns-htk:
-            proxy_server: proxy.example.com:8080
          etcd:
            proxy_server: proxy.example.com:8080
-          etcd-htk:
-            proxy_server: proxy.example.com:8080
          haproxy:
            proxy_server: proxy.example.com:8080
-          haproxy-htk:
-            proxy_server: proxy.example.com:8080
          ingress:
            proxy_server: proxy.example.com:8080
-          ingress-htk:
-            proxy_server: proxy.example.com:8080
          proxy:
            proxy_server: proxy.example.com:8080
-          proxy-htk:
-            proxy_server: proxy.example.com:8080
          scheduler:
            proxy_server: proxy.example.com:8080
-          scheduler-htk:
-            proxy_server: proxy.example.com:8080
        osh:
          barbican:
            proxy_server: proxy.example.com:8080
          cinder:
            proxy_server: proxy.example.com:8080
-          cinder-htk:
-            proxy_server: proxy.example.com:8080
          glance:
            proxy_server: proxy.example.com:8080
-          glance-htk:
-            proxy_server: proxy.example.com:8080
          heat:
            proxy_server: proxy.example.com:8080
-          heat-htk:
-            proxy_server: proxy.example.com:8080
          helm_toolkit:
            proxy_server: proxy.example.com:8080
          horizon:
            proxy_server: proxy.example.com:8080
-          horizon-htk:
-            proxy_server: proxy.example.com:8080
          ingress:
            proxy_server: proxy.example.com:8080
-          ingress-htk:
-            proxy_server: proxy.example.com:8080
          keystone:
            proxy_server: proxy.example.com:8080
-          keystone-htk:
-            proxy_server: proxy.example.com:8080
          libvirt:
            proxy_server: proxy.example.com:8080
-          libvirt-htk:
-            proxy_server: proxy.example.com:8080
          mariadb:
            proxy_server: proxy.example.com:8080
-          mariadb-htk:
-            proxy_server: proxy.example.com:8080
          memcached:
            proxy_server: proxy.example.com:8080
-          memcached-htk:
-            proxy_server: proxy.example.com:8080
          neutron:
            proxy_server: proxy.example.com:8080
-          neutron-htk:
-            proxy_server: proxy.example.com:8080
          nova:
            proxy_server: proxy.example.com:8080
-          nova-htk:
-            proxy_server: proxy.example.com:8080
          openvswitch:
            proxy_server: proxy.example.com:8080
-          openvswitch-htk:
-            proxy_server: proxy.example.com:8080
          rabbitmq:
            proxy_server: proxy.example.com:8080
-          rabbitmq-htk:
-            proxy_server: proxy.example.com:8080
          tempest:
            proxy_server: proxy.example.com:8080
-          tempest-htk:
-            proxy_server: proxy.example.com:8080
        osh_infra:
          elasticsearch:
            proxy_server: proxy.example.com:8080
@@ -445,16 +397,10 @@ Under site/airsloop/software/config/ create a versions.yaml file in the followin
        ucp:
          armada:
            proxy_server: proxy.example.com:8080
-          armada-htk:
-            proxy_server: proxy.example.com:8080
          barbican:
            proxy_server: proxy.example.com:8080
-          barbican-htk:
-            proxy_server: proxy.example.com:8080
          ceph-client:
            proxy_server: proxy.example.com:8080
-          ceph-htk:
-            proxy_server: proxy.example.com:8080
          ceph-mon:
            proxy_server: proxy.example.com:8080
          ceph-osd:
@@ -465,56 +411,30 @@ Under site/airsloop/software/config/ create a versions.yaml file in the followin
            proxy_server: proxy.example.com:8080
          deckhand:
            proxy_server: proxy.example.com:8080
-          deckhand-htk:
-            proxy_server: proxy.example.com:8080
          divingbell:
            proxy_server: proxy.example.com:8080
-          divingbell-htk:
-            proxy_server: proxy.example.com:8080
          drydock:
            proxy_server: proxy.example.com:8080
-          drydock-htk:
-            proxy_server: proxy.example.com:8080
          ingress:
            proxy_server: proxy.example.com:8080
-          ingress-htk:
-            proxy_server: proxy.example.com:8080
          keystone:
            proxy_server: proxy.example.com:8080
-          keystone-htk:
-            proxy_server: proxy.example.com:8080
          maas:
            proxy_server: proxy.example.com:8080
-          maas-htk:
-            proxy_server: proxy.example.com:8080
          mariadb:
            proxy_server: proxy.example.com:8080
-          mariadb-htk:
-            proxy_server: proxy.example.com:8080
          memcached:
            proxy_server: proxy.example.com:8080
-          memcached-htk:
-            proxy_server: proxy.example.com:8080
          postgresql:
            proxy_server: proxy.example.com:8080
-          postgresql-htk:
-            proxy_server: proxy.example.com:8080
          promenade:
            proxy_server: proxy.example.com:8080
-          promenade-htk:
-            proxy_server: proxy.example.com:8080
          rabbitmq:
            proxy_server: proxy.example.com:8080
-          rabbitmq-htk:
-            proxy_server: proxy.example.com:8080
          shipyard:
            proxy_server: proxy.example.com:8080
-          shipyard-htk:
-            proxy_server: proxy.example.com:8080
          tenant-ceph-client:
            proxy_server: proxy.example.com:8080
-          tenant-ceph-htk:
-            proxy_server: proxy.example.com:8080
          tenant-ceph-mon:
            proxy_server: proxy.example.com:8080
          tenant-ceph-osd:
@@ -525,8 +445,6 @@ Under site/airsloop/software/config/ create a versions.yaml file in the followin
            proxy_server: proxy.example.com:8080
          tiller:
            proxy_server: proxy.example.com:8080
-          tiller-htk:
-            proxy_server: proxy.example.com:8080
    metadata:
      name: software-versions
      replacement: true
--- a/global/schemas/pegleg/SoftwareVersions/v1.yaml
+++ b/global/schemas/pegleg/SoftwareVersions/v1.yaml
@@ -27,17 +27,6 @@ data:
                      type: string
                    reference:
                      type: string
-                etcd-htk:
-                  type: object
-                  properties:
-                    type:
-                      type: string
-                    location:
-                      type: string
-                    subpath:
-                      type: string
-                    reference:
-                      type: string
                calico:
                  type: object
                  properties:
@@ -60,17 +49,6 @@ data:
                  type: string
                reference:
                  type: string
-            apiserver-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
            controller-manager:
              type: object
              properties:
@@ -82,17 +60,6 @@ data:
                  type: string
                reference:
                  type: string
-            controller-manager-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
            coredns:
              type: object
              properties:
@@ -104,17 +71,6 @@ data:
                  type: string
                reference:
                  type: string
-            coredns-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
            haroxy:
              type: object
              properties:
@@ -124,15 +80,6 @@ data:
                  type: string
                subpath:
                  type: string
-            haroxy-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
            etcd:
              type: object
              properties:
@@ -144,17 +91,6 @@ data:
                  type: string
                reference:
                  type: string
-            etcd-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
            ingress:
              type: object
              properties:
@@ -166,17 +102,6 @@ data:
                  type: string
                reference:
                  type: string
-            ingress-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
            proxy:
              type: object
              properties:
@@ -188,17 +113,6 @@ data:
                  type: string
                reference:
                  type: string
-            proxy-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
            scheduler:
              type: object
              properties:
@@ -210,17 +124,6 @@ data:
                  type: string
                reference:
                  type: string
-            scheduler-htk:
-              type: object
-              properties:
-                type:
-                  type: string
-                location:
-                  type: string
-                subpath:
-                  type: string
-                reference:
-                  type: string
        osh_infra:
          type: object
          properties:
--- a/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
+++ b/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
@@ -89,6 +89,4 @@ data:
          userSecretName: pvc-ceph-client-key
      cephfs:
        provision_storage_class: false
-  dependencies:
-    - ceph-htk
 ...
--- a/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
+++ b/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
@@ -89,6 +89,4 @@ data:
          userSecretName: pvc-ceph-client-key
      cephfs:
        provision_storage_class: false
-  dependencies:
-    - ceph-htk
 ...
--- a/global/software/charts/osh/openstack-compute-kit/libvirt.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/libvirt.yaml
@@ -47,29 +47,4 @@ data:
    ceph_client:
      configmap: tenant-ceph-etc
      user_secret_name: pvc-tceph-client-key
-  dependencies:
-    - libvirt-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: libvirt-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.libvirt-htk
-      dest:
-        path: .source
-data:
-  chart_name: libvirt-htk
-  release: libvirt-htk
-  namespace: libvirt-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -341,29 +341,4 @@ data:
            tenant_network_types: vxlan
          ml2_type_vlan:
            network_vlan_ranges: external
-  dependencies:
-    - neutron-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: neutron-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.neutron-htk
-      dest:
-        path: .source
-data:
-  chart_name: neutron-htk
-  release: neutron-htk
-  namespace: neutron-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/osh/openstack-compute-kit/nova.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/nova.yaml
@@ -425,29 +425,4 @@ data:
          class: oslo_log.formatters.ContextFormatter
        formatter_default:
          format: "%(message)s"
-  dependencies:
-    - nova-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: nova-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.nova-htk
-      dest:
-        path: .source
-data:
-  chart_name: nova-htk
-  release: nova-htk
-  namespace: nova-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/osh/openstack-compute-kit/openvswitch.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/openvswitch.yaml
@@ -46,29 +46,4 @@ data:
      ovs:
        node_selector_key: openvswitch
        node_selector_value: enabled
-  dependencies:
-    - openvswitch-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: openvswitch-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.openvswitch-htk
-      dest:
-        path: .source
-data:
-  chart_name: openvswitch-htk
-  release: openvswitch-htk
-  namespace: openvswitch-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/osh/openstack-horizon/horizon.yaml
+++ b/global/software/charts/osh/openstack-horizon/horizon.yaml
@@ -119,29 +119,4 @@ data:
    pod:
      replicas:
        server: 2
-  dependencies:
-    - horizon-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: horizon-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.horizon-htk
-      dest:
-        path: .source
-data:
-  chart_name: horizon-htk
-  release: horizon-htk
-  namespace: horizon-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-rabbitmq/rabbitmq.yaml
@@ -94,29 +94,4 @@ data:
    monitoring:
      prometheus:
        enabled: true
-  dependencies:
-    - openstack-rabbitmq-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: openstack-rabbitmq-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.rabbitmq-htk
-      dest:
-        path: .source
-data:
-  chart_name: openstack-rabbitmq-htk
-  release: openstack-rabbitmq-htk
-  namespace: openstack-rabbitmq-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/osh/openstack-tempest/tempest.yaml
+++ b/global/software/charts/osh/openstack-tempest/tempest.yaml
@@ -89,29 +89,4 @@ data:
    ceph_client:
      configmap: tenant-ceph-etc
      user_secret_name: pvc-tceph-client-key
-  dependencies:
-    - tempest-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: tempest-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.osh.tempest-htk
-      dest:
-        path: .source
-data:
-  chart_name: tempest-htk
-  release: tempest-htk
-  namespace: tempest-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/utilities/calicoctl-utility.yaml
+++ b/global/software/charts/utilities/calicoctl-utility.yaml
@@ -79,29 +79,4 @@ data:
      deployment_calicoctl_utility: true
      job_image_repo_sync: false
      secret_certificates: true
-  dependencies:
-    - calicoctl-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: calicoctl-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.calicoctl-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: calicoctl-utility-htk
-  release: calicoctl-utility-htk
-  namespace: calicoctl-utility-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/utilities/ceph-utility-config.yaml
+++ b/global/software/charts/utilities/ceph-utility-config.yaml
@@ -87,6 +87,4 @@ data:
      rbd:
        ceph_configmap_name: ceph-etc
        user_secret_name: pvc-ceph-client-key
-  dependencies:
-    - ceph-htk
 ...
--- a/global/software/charts/utilities/ceph-utility.yaml
+++ b/global/software/charts/utilities/ceph-utility.yaml
@@ -43,29 +43,4 @@ data:
      utility:
        node_selector_key: utility
        node_selector_value: enabled
-  dependencies:
-    - ceph-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.ceph-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: ceph-utility-htk
-  release: ceph-utility-htk
-  namespace: ceph-utility-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/utilities/compute-utility.yaml
+++ b/global/software/charts/utilities/compute-utility.yaml
@@ -49,29 +49,4 @@ data:
      configmap_etc_client: true
      configmap_etc_sudoers: true
      deployment_utility: true
-  dependencies:
-    - compute-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: compute-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.compute-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: compute-utility-htk
-  release: compute-utility-htk
-  namespace: compute-utility-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/utilities/etcdctl-utility.yaml
+++ b/global/software/charts/utilities/etcdctl-utility.yaml
@@ -83,29 +83,4 @@ data:
      deployment_etcdctl_utility: true
      job_image_repo_sync: false
      secret_certificates: true
-  dependencies:
-    - etcdctl-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: etcdctl-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.etcdctl-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: etcdctl-utility-htk
-  release: etcdctl-utility-htk
-  namespace: etcdctl-utility-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/utilities/mysqlclient-utility.yaml
+++ b/global/software/charts/utilities/mysqlclient-utility.yaml
@@ -46,29 +46,3 @@ data:
      configmap_etc_client: true
      deployment_utility: true
      job_image_repo_sync: false
-  dependencies:
-    - mysqlclient-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: mysqlclient-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.mysqlclient-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: mysqlclient-utility-htk
-  release: mysqlclient-utility-htk
-  namespace: mysqlclient-utility-htk
-  values: {}
-  dependencies: []
-...
--- a/global/software/charts/utilities/openstack-utility.yaml
+++ b/global/software/charts/utilities/openstack-utility.yaml
@@ -49,29 +49,4 @@ data:
      configmap_etc_client: true
      configmap_etc_sudoers: true
      deployment_utility: true
-  dependencies:
-    - openstack-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: openstack-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.openstack-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: openstack-utility-htk
-  release: openstack-utility-htk
-  namespace: openstack-utility-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/charts/utilities/postgresql-utility.yaml
+++ b/global/software/charts/utilities/postgresql-utility.yaml
@@ -56,29 +56,4 @@ data:
      configmap_etc_client: true
      configmap_etc_sudoers: true
      deployment_utility: true
-  dependencies:
-    - postgresql-utility-htk
-...
---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: postgresql-utility-htk
-  layeringDefinition:
-    abstract: false
-    layer: global
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: pegleg/SoftwareVersions/v1
-        name: software-versions
-        path: .charts.utility.postgresql-utility-htk
-      dest:
-        path: .source
-data:
-  chart_name: postgresql-utility-htk
-  release: postgresql-utility-htk
-  namespace: postgresql-utility-htk
-  values: {}
-  dependencies: []
 ...
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -65,15 +65,9 @@ data:
        subpath: helm-toolkit
        type: tar
      horizon:
-        location: https://opendev.org/openstack/openstack-helm
-        reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
+        location: http://control-plane.minikube.internal:8282/horizon.tgz
        subpath: horizon
-        type: git
-      horizon-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
      ingress:
        location: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.11.2/ingress-nginx-4.11.2.tgz
        subpath: ingress-nginx
@@ -83,15 +77,9 @@ data:
        subpath: keystone
        type: tar
      libvirt:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/libvirt.tgz
        subpath: libvirt
-        type: git
-      libvirt-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
      mariadb:
        location: http://control-plane.minikube.internal:8282/mariadb.tgz
        subpath: mariadb
@@ -101,130 +89,86 @@ data:
        subpath: memcached
        type: tar
      neutron:
-        location: https://opendev.org/openstack/openstack-helm
-        reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
+        location: http://control-plane.minikube.internal:8282/neutron.tgz
        subpath: neutron
-        type: git
-      neutron-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
      nova:
-        location: https://opendev.org/openstack/openstack-helm
-        reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
+        location: http://control-plane.minikube.internal:8282/nova.tgz
        subpath: nova
-        type: git
-      nova-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
      openvswitch:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/openvswitch.tgz
        subpath: openvswitch
-        type: git
-      openvswitch-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
      rabbitmq:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/rabbitmq.tgz
        subpath: rabbitmq
-        type: git
-      rabbitmq-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
      tempest:
-        location: https://opendev.org/openstack/openstack-helm
-        reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
+        location: http://control-plane.minikube.internal:8282/tempest.tgz
        subpath: tempest
-        type: git
-      tempest-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
-        subpath: helm-toolkit
-        type: git
+        type: tar
    osh_infra:
      elasticsearch:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/elasticsearch.tgz
        subpath: elasticsearch
-        type: git
+        type: tar
      fluentbit:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/fluentbit.tgz
        subpath: fluentbit
-        type: git
+        type: tar
      fluentd:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/fluentd.tgz
        subpath: fluentd
-        type: git
+        type: tar
      grafana:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/grafana.tgz
        subpath: grafana
-        type: git
+        type: tar
      helm_toolkit:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/helm-toolkit.tgz
        subpath: helm-toolkit
-        type: git
+        type: tar
      kibana:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/kibana.tgz
        subpath: kibana
-        type: git
+        type: tar
      nagios:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/nagios.tgz
        subpath: nagios
-        type: git
+        type: tar
      nfs_provisioner:
        location: http://control-plane.minikube.internal:8282/nfs-provisioner.tgz
        subpath: nfs-provisioner
        type: tar
      podsecuritypolicy:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/podsecuritypolicy.tgz
        subpath: podsecuritypolicy
-        type: git
+        type: tar
      prometheus:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/prometheus.tgz
        subpath: prometheus
-        type: git
+        type: tar
      prometheus_alertmanager:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/prometheus-alertmanager.tgz
        subpath: prometheus-alertmanager
-        type: git
+        type: tar
      prometheus_kube_state_metrics:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/prometheus-kube-state-metrics.tgz
        subpath: prometheus-kube-state-metrics
-        type: git
+        type: tar
      prometheus_node_exporter:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/prometheus-node-exporter.tgz
        subpath: prometheus-node-exporter
-        type: git
+        type: tar
      prometheus_openstack_exporter:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/prometheus-openstack-exporter.tgz
        subpath: prometheus-openstack-exporter
-        type: git
+        type: tar
      prometheus_process_exporter:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+        location: http://control-plane.minikube.internal:8282/prometheus-process-exporter.tgz
        subpath: prometheus-process-exporter
-        type: git
+        type: tar
    ucp:
      armada:
        location: http://control-plane.minikube.internal:8282/armada.tgz
@@ -324,75 +268,33 @@ data:
        type: tar
    utility:
      calicoctl-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/calicoctl-utility
-        type: git
-      calicoctl-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/calicoctl-utility.tgz
+        subpath: calicoctl-utility
+        type: tar
      ceph-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/ceph-utility
-        type: git
-      ceph-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/ceph-utility.tgz
+        subpath: ceph-utility
+        type: tar
      compute-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/compute-utility
-        type: git
-      compute-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/compute-utility.tgz
+        subpath: compute-utility
+        type: tar
      etcdctl-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/etcdctl-utility
-        type: git
-      etcdctl-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/etcdctl-utility.tgz
+        subpath: etcdctl-utility
+        type: tar
      mysqlclient-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/mysqlclient-utility
-        type: git
-      mysqlclient-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/mysqlclient-utility.tgz
+        subpath: mysqlclient-utility
+        type: tar
      openstack-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/openstack-utility
-        type: git
-      openstack-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/openstack-utility.tgz
+        subpath: openstack-utility
+        type: tar
      postgresql-utility:
-        location: https://opendev.org/airship/porthole
-        reference: 017902b5ceea9b580be741cb3498188d7e7616cc
-        subpath: charts/postgresql-utility
-        type: git
-      postgresql-utility-htk:
-        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
-        subpath: helm-toolkit
-        type: git
+        location: http://control-plane.minikube.internal:8282/postgresql-utility.tgz
+        subpath: postgresql-utility
+        type: tar
  files:
    kubernetes: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz

--- a/site/seaworthy-virt/software/charts/kubernetes/container-networking/calico.yaml
+++ b/site/seaworthy-virt/software/charts/kubernetes/container-networking/calico.yaml
@@ -155,6 +155,4 @@ data:
      job_image_repo_sync: false
      pod_calicoctl: false
      service_calico_etcd: false
-  dependencies:
-    - calico-htk
 ...
--- a/tools/deployment/airskiff/developer/000-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
@@ -18,16 +18,15 @@
 set -xe

 : "${INSTALL_PATH:="../"}"
-: "${OSH_COMMIT:="540df5cb0dbdaed63c202e2d6f2b7891062f8203"}"
-: "${OSH_INFRA_COMMIT:="43fd7143481b6ddda0dbd2f26bf6ec39a417b15b"}"
+: "${OSH_COMMIT:="master"}"
 : "${CLONE_ARMADA:=true}"
 : "${CLONE_ARMADA_GO:=true}"
 : "${CLONE_ARMADA_OPERATOR:=true}"
 : "${CLONE_DECKHAND:=true}"
 : "${CLONE_SHIPYARD:=true}"
-: "${CLONE_PORTHOLE:=true}"
 : "${CLONE_PROMENADE:=true}"
 : "${CLONE_PEGLEG:=true}"
+: "${CLONE_PORTHOLE:=true}"
 : "${CLONE_KUBERNETES_ENTRYPOINT:=true}"
 : "${CLONE_MAAS:=true}"
 : "${CLONE_OSH:=true}"
@@ -37,9 +36,9 @@ CLONE_ARMADA_GO=$(echo "$CLONE_ARMADA_GO" | tr '[:upper:]' '[:lower:]')
 CLONE_ARMADA_OPERATOR=$(echo "$CLONE_ARMADA_OPERATOR" | tr '[:upper:]' '[:lower:]')
 CLONE_DECKHAND=$(echo "$CLONE_DECKHAND" | tr '[:upper:]' '[:lower:]')
 CLONE_SHIPYARD=$(echo "$CLONE_SHIPYARD" | tr '[:upper:]' '[:lower:]')
-CLONE_PORTHOLE=$(echo "$CLONE_PORTHOLE" | tr '[:upper:]' '[:lower:]')
 CLONE_PROMENADE=$(echo "$CLONE_PROMENADE" | tr '[:upper:]' '[:lower:]')
 CLONE_PEGLEG=$(echo "$CLONE_PEGLEG" | tr '[:upper:]' '[:lower:]')
+CLONE_PORTHOLE=$(echo "$CLONE_PORTHOLE" | tr '[:upper:]' '[:lower:]')
 CLONE_KUBERNETES_ENTRYPOINT=$(echo "$CLONE_KUBERNETES_ENTRYPOINT" | tr '[:upper:]' '[:lower:]')
 CLONE_MAAS=$(echo "$CLONE_MAAS" | tr '[:upper:]' '[:lower:]')
 CLONE_OSH=$(echo "$CLONE_OSH" | tr '[:upper:]' '[:lower:]')
@@ -49,9 +48,9 @@ export CLONE_ARMADA_GO
 export CLONE_ARMADA_OPERATOR
 export CLONE_DECKHAND
 export CLONE_SHIPYARD
-export CLONE_PORTHOLE
 export CLONE_PROMENADE
 export CLONE_PEGLEG
+export CLONE_PORTHOLE
 export CLONE_KUBERNETES_ENTRYPOINT
 export CLONE_MAAS
 export CLONE_OSH
@@ -80,28 +79,20 @@ fi
 if [[ ${CLONE_PEGLEG} = true ]] ; then
    git clone https://opendev.org/airship/pegleg.git
 fi
+if [[ ${CLONE_PORTHOLE} = true ]] ; then
+    git clone https://opendev.org/airship/porthole.git
+fi
 if [[ ${CLONE_KUBERNETES_ENTRYPOINT} = true ]] ; then
    git clone https://opendev.org/airship/kubernetes-entrypoint.git
 fi
-
-
-# Clone dependencies
 if [[ ${CLONE_MAAS} = true ]] ; then
    git clone "https://review.opendev.org/airship/maas.git"
 fi
-if [[ ${CLONE_PORTHOLE} = true ]] ; then
-    git clone "https://review.opendev.org/airship/porthole.git"
-fi
+
+# Clone dependencies
 if [[ ${CLONE_OSH} = true ]] ; then
    git clone "https://opendev.org/openstack/openstack-helm.git"
    pushd openstack-helm
    git checkout "${OSH_COMMIT}"
    popd
 fi
-
-
-git clone "https://opendev.org/openstack/openstack-helm-infra.git"
-pushd openstack-helm-infra
-git checkout "${OSH_INFRA_COMMIT}"
-popd
-
--- a/tools/deployment/airskiff/developer/015-make-all-charts.sh
+++ b/tools/deployment/airskiff/developer/015-make-all-charts.sh
@@ -20,9 +20,8 @@ set -xe
 CURRENT_DIR="$(pwd)"
 : "${INSTALL_PATH:="../"}"
 : "${ARTIFACTS_PATH:="../artifacts"}"
-: "${HTK_COMMIT:="962333df313e04a01923ca8394d2a44f2afbb714"}"
+: "${HTK_COMMIT:="master"}"
 : "${MAKE_CHARTS_OPENSTACK_HELM:=true}"
-: "${MAKE_CHARTS_OSH_INFRA:=true}"
 : "${MAKE_CHARTS_ARMADA:=true}"
 : "${MAKE_CHARTS_DECKHAND:=true}"
 : "${MAKE_CHARTS_SHIPYARD:=true}"
@@ -32,7 +31,6 @@ CURRENT_DIR="$(pwd)"


 MAKE_CHARTS_OPENSTACK_HELM=$(echo "$MAKE_CHARTS_OPENSTACK_HELM" | tr '[:upper:]' '[:lower:]')
-MAKE_CHARTS_OSH_INFRA=$(echo "$MAKE_CHARTS_OSH_INFRA" | tr '[:upper:]' '[:lower:]')
 MAKE_CHARTS_ARMADA=$(echo "$MAKE_CHARTS_ARMADA" | tr '[:upper:]' '[:lower:]')
 MAKE_CHARTS_DECKHAND=$(echo "$MAKE_CHARTS_DECKHAND" | tr '[:upper:]' '[:lower:]')
 MAKE_CHARTS_SHIPYARD=$(echo "$MAKE_CHARTS_SHIPYARD" | tr '[:upper:]' '[:lower:]')
@@ -40,7 +38,6 @@ MAKE_CHARTS_MAAS=$(echo "$MAKE_CHARTS_MAAS" | tr '[:upper:]' '[:lower:]')
 MAKE_CHARTS_PORTHOLE=$(echo "$MAKE_CHARTS_PORTHOLE" | tr '[:upper:]' '[:lower:]')
 MAKE_CHARTS_PROMENADE=$(echo "$MAKE_CHARTS_PROMENADE" | tr '[:upper:]' '[:lower:]')
 export MAKE_CHARTS_OPENSTACK_HELM
-export MAKE_CHARTS_OSH_INFRA
 export MAKE_CHARTS_ARMADA
 export MAKE_CHARTS_DECKHAND
 export MAKE_CHARTS_SHIPYARD
@@ -59,7 +56,7 @@ if [[ ${MAKE_CHARTS_ARMADA} = true ]] ; then
    cd charts
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
-        find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
    done
    popd
 fi
@@ -68,7 +65,7 @@ if [[ ${MAKE_CHARTS_DECKHAND} = true ]] ; then
    make charts
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
-        find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
    done
    popd
 fi
@@ -77,16 +74,7 @@ if [[ ${MAKE_CHARTS_SHIPYARD} = true ]] ; then
    make charts
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
-        find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
-    done
-    popd
-fi
-if [[ ${MAKE_CHARTS_OSH_INFRA} = true ]] ; then
-    pushd openstack-helm-infra
-    make all SKIP_CHANGELOG=1
-    for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -E 's|\.\/([a-zA-Z0-9\-]+)-[0-9.]+\+.*\.tgz|\1|' | sort -u)
-    do
-        find . -name "$i-[0-9]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
    done
    popd
 fi
@@ -95,7 +83,7 @@ if [[ ${MAKE_CHARTS_OPENSTACK_HELM} = true ]] ; then
    make all SKIP_CHANGELOG=1
    for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -E 's|\.\/([a-zA-Z0-9\-]+)-[0-9.]+\+.*\.tgz|\1|' | sort -u)
    do
-        find . -name "$i-[0-9]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
    done
    popd
 fi
@@ -104,7 +92,7 @@ if [[ ${MAKE_CHARTS_MAAS} = true ]] ; then
    make charts
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
-        find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
    done
    popd
 fi
@@ -114,7 +102,7 @@ if [[ ${MAKE_CHARTS_PORTHOLE} = true ]] ; then
    cd charts
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
-        find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
    done
    popd
 fi
@@ -124,7 +112,7 @@ if [[ ${MAKE_CHARTS_PROMENADE} = true ]] ; then
    cd charts
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
-        find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
+        find . -maxdepth 1 -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
    done
    popd
 fi