From 21d19a53b582cb6c72755e13f583a7bff60cfb4c Mon Sep 17 00:00:00 2001 From: Daniel Caires Date: Wed, 5 Nov 2025 08:56:01 -0300 Subject: [PATCH] Create sourced packages new folder structure All packages that are sourced from upstream respositories will be moved to the upstream/ folder. This change creates a new folder named helm-charts/ under the upstream directory, and moves the ingress-nginx package to it. This change, also creates a new folder for the openstack-helm package, but does not move the existing OSH and OSH-I to it. This choice is part of the ongoing effort to upversion the Openstack helm packages to the epoxy version. The new OSH folder is created with only placeholder files, and during the work to upversion OSH, it will be filled as to not disrupt the build process during the upversion tasks. The new structure is as follow: openstack-armada-app: |--- enhanced-policies |--- openstack-helm |--- openstack-helm-infra |--- python3-k8sapp-openstack |--- stx-openstack-helm-fluxcd |--- upstream |--- helm-charts |--- ingress-nginx-helm |--- openstack-helm |--- openstack As said in the paragraph above the original Oopenstack helm and Openstack Helm-Infra pacakages were not yet removed from the root dir of the repository, this will be done in future tasks when the process of upversion for the Openstack helm epoxy version is completed. Test Plan: PASS - Build all packages and STX-O tarball PASS - Guarantee no error in the ingress-nginx-helm package buils PASS - Upload and apply STX Openstack PASs - Remove and Delete application Story: 2011516 Task: 52984 Change-Id: Ic44a9d95df357d4dbf7d64d2b9cfe7881d8618fa Signed-off-by: Daniel Caires --- debian_pkg_dirs | 2 +- .../helm-charts/ingress-nginx-helm}/debian/deb_folder/changelog | 0 .../helm-charts/ingress-nginx-helm}/debian/deb_folder/control | 0 .../helm-charts/ingress-nginx-helm}/debian/deb_folder/copyright | 0 .../debian/deb_folder/ingress-nginx-helm.install | 0 .../deb_folder/patches/0001-Change-Ingress-chart-name.patch | 0 .../ingress-nginx-helm}/debian/deb_folder/patches/series | 0 .../helm-charts/ingress-nginx-helm}/debian/deb_folder/rules | 0 .../ingress-nginx-helm}/debian/deb_folder/source/format | 0 .../helm-charts/ingress-nginx-helm}/debian/meta_data.yaml | 2 +- .../ingress-nginx-helm}/ingress-nginx-helm/files/Makefile | 0 upstream/helm-charts/openstack-helm/debian/deb_folder/changelog | 0 upstream/helm-charts/openstack-helm/debian/deb_folder/control | 0 upstream/helm-charts/openstack-helm/debian/deb_folder/copyright | 0 .../openstack-helm/debian/deb_folder/openstack-helm.install | 0 upstream/helm-charts/openstack-helm/debian/deb_folder/rules | 0 upstream/helm-charts/openstack-helm/debian/meta_data.yaml | 1 + upstream/helm-charts/openstack-helm/files/index.yaml | 0 upstream/helm-charts/openstack-helm/files/repositories.yaml | 0 19 files changed, 3 insertions(+), 2 deletions(-) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/changelog (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/control (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/copyright (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/ingress-nginx-helm.install (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/patches/series (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/rules (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/deb_folder/source/format (100%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/debian/meta_data.yaml (71%) rename {ingress-nginx-helm => upstream/helm-charts/ingress-nginx-helm}/ingress-nginx-helm/files/Makefile (100%) create mode 100644 upstream/helm-charts/openstack-helm/debian/deb_folder/changelog create mode 100644 upstream/helm-charts/openstack-helm/debian/deb_folder/control create mode 100644 upstream/helm-charts/openstack-helm/debian/deb_folder/copyright create mode 100644 upstream/helm-charts/openstack-helm/debian/deb_folder/openstack-helm.install create mode 100644 upstream/helm-charts/openstack-helm/debian/deb_folder/rules create mode 100644 upstream/helm-charts/openstack-helm/debian/meta_data.yaml create mode 100644 upstream/helm-charts/openstack-helm/files/index.yaml create mode 100644 upstream/helm-charts/openstack-helm/files/repositories.yaml diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 47892141..2dab71fe 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -2,7 +2,7 @@ openstack-helm openstack-helm-infra python3-k8sapp-openstack stx-openstack-helm-fluxcd -ingress-nginx-helm +upstream/helm-charts/ingress-nginx-helm upstream/openstack/openstack-pkg-tools upstream/openstack/python-cinderclient upstream/openstack/python-glanceclient diff --git a/ingress-nginx-helm/debian/deb_folder/changelog b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/changelog similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/changelog rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/changelog diff --git a/ingress-nginx-helm/debian/deb_folder/control b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/control similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/control rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/control diff --git a/ingress-nginx-helm/debian/deb_folder/copyright b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/copyright similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/copyright rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/copyright diff --git a/ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/ingress-nginx-helm.install diff --git a/ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/0001-Change-Ingress-chart-name.patch diff --git a/ingress-nginx-helm/debian/deb_folder/patches/series b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/series similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/patches/series rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/patches/series diff --git a/ingress-nginx-helm/debian/deb_folder/rules b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/rules similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/rules rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/rules diff --git a/ingress-nginx-helm/debian/deb_folder/source/format b/upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/source/format similarity index 100% rename from ingress-nginx-helm/debian/deb_folder/source/format rename to upstream/helm-charts/ingress-nginx-helm/debian/deb_folder/source/format diff --git a/ingress-nginx-helm/debian/meta_data.yaml b/upstream/helm-charts/ingress-nginx-helm/debian/meta_data.yaml similarity index 71% rename from ingress-nginx-helm/debian/meta_data.yaml rename to upstream/helm-charts/ingress-nginx-helm/debian/meta_data.yaml index 6788b6b5..860801dd 100644 --- a/ingress-nginx-helm/debian/meta_data.yaml +++ b/upstream/helm-charts/ingress-nginx-helm/debian/meta_data.yaml @@ -1,7 +1,7 @@ --- debname: ingress-nginx-helm debver: 4.12-1 -src_path: ${MY_REPO}/stx/openstack-armada-app/ingress-nginx-helm +src_path: ${MY_REPO}/stx/openstack-armada-app/upstream/helm-charts/ingress-nginx-helm dl_path: name: ingress-nginx-helm-chart-4.12.1.tar.gz url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.12.1.tar.gz diff --git a/ingress-nginx-helm/ingress-nginx-helm/files/Makefile b/upstream/helm-charts/ingress-nginx-helm/ingress-nginx-helm/files/Makefile similarity index 100% rename from ingress-nginx-helm/ingress-nginx-helm/files/Makefile rename to upstream/helm-charts/ingress-nginx-helm/ingress-nginx-helm/files/Makefile diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/changelog b/upstream/helm-charts/openstack-helm/debian/deb_folder/changelog new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/control b/upstream/helm-charts/openstack-helm/debian/deb_folder/control new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/copyright b/upstream/helm-charts/openstack-helm/debian/deb_folder/copyright new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/openstack-helm.install b/upstream/helm-charts/openstack-helm/debian/deb_folder/openstack-helm.install new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/deb_folder/rules b/upstream/helm-charts/openstack-helm/debian/deb_folder/rules new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/debian/meta_data.yaml b/upstream/helm-charts/openstack-helm/debian/meta_data.yaml new file mode 100644 index 00000000..d4ef0a48 --- /dev/null +++ b/upstream/helm-charts/openstack-helm/debian/meta_data.yaml @@ -0,0 +1 @@ +# Placeholder for the OSH metadata diff --git a/upstream/helm-charts/openstack-helm/files/index.yaml b/upstream/helm-charts/openstack-helm/files/index.yaml new file mode 100644 index 00000000..e69de29b diff --git a/upstream/helm-charts/openstack-helm/files/repositories.yaml b/upstream/helm-charts/openstack-helm/files/repositories.yaml new file mode 100644 index 00000000..e69de29b