fix python build on photon

saltstack · Nov 13, 2024 · e8240a0 · e8240a0
1 parent bcb15f4
commit e8240a0
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 4 deletions.
diff --git a/custom/testing/golden-state-tree/os/photon/config/init.sls b/custom/testing/golden-state-tree/os/photon/config/init.sls
@@ -1,9 +1,11 @@
 include:
-  - .ssh_config
   - config.path
   - config.ulimits
   - config.locale
+{#-
+  - .ssh_config
   - config.sssd
-  - config.timezone
   - config.dhclient
   - config.sshd_config
+  - config.timezone
+#}
diff --git a/custom/testing/golden-state-tree/os/photon/init.sls b/custom/testing/golden-state-tree/os/photon/init.sls
@@ -1,6 +1,10 @@
+
+
+
 include:
   - .config
   - .pkgs
+  - python
 
   {%- if pillar.get('github_actions_runner', False) %}
   - github-actions-runner

diff --git a/custom/testing/golden-state-tree/os/photon/pkgs/init.sls b/custom/testing/golden-state-tree/os/photon/pkgs/init.sls
@@ -1,5 +1,13 @@
+
+install_rpm:
+  cmd.run:
+    - name: tdnf install -y rpm
+    - if_missing: /usr/bin/rpm
+    - order: 0
+
 include:
   - pkgs.cron
+  {#-
   - pkgs.bower
   - pkgs.curl
   - pkgs.dmidecode
@@ -34,3 +42,4 @@ include:
   - pkgs.rust {#-
   - pkgs.awscli
   - pkgs.amazon-cloudwatch-agent #}
+  #}
diff --git a/...state-tree/python/ubuntu_dependencies.sls → ...state-tree/python/debian_dependencies.sls b/...state-tree/python/ubuntu_dependencies.sls → ...state-tree/python/debian_dependencies.sls
diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
@@ -6,7 +6,22 @@
 {%- endif %}
 
 include:
-  - ./{{ grains['os'].lower() }}_dependencies
+  {%- if grains['os'] == 'Rocky' %}
+  - .rocky_dependencies
+  {%- elif grains.get("oscodename") == 'Amazon Linux 2' %}
+  - .rocky_dependencies
+  {%- elif grains.get("osfinger") == 'Amazon Linux-2023' %}
+  - .rocky_dependencies
+  {%- elif grains['os'] == 'VMware Photon OS' %}
+  - .photon_dependencies
+  {%- elif grains['os'] == 'Debian' %}
+  - .debian_dependencies
+  {%- elif grains['os'] == 'Ubuntu' %}
+  - .debian_dependencies
+  {%- else %}
+  - .{{ grains['os'].lower() }}_dependencies
+  {% endif %}
+
 
 python_source_archive:
   file.managed:

diff --git a/custom/testing/golden-state-tree/python/photon_dependencies.sls b/custom/testing/golden-state-tree/python/photon_dependencies.sls
@@ -0,0 +1,30 @@
+{#-
+#}
+
+coreutils:
+   pkg.installed:
+    - name: coreutils-selinux
+
+python_dependencies:
+   pkg.latest:
+     - pkgs:
+       - gcc
+       - make
+       - findutils
+       - binutils
+       - build-essential
+       - pkg-config
+       - openssl-devel
+       - libffi-devel
+       - bzip2-devel
+       - zlib-devel
+       - readline-devel
+       - ncurses-devel
+       - gdbm-devel
+       - sqlite-devel
+       - xz-devel
+       - expat-devel
+       - util-linux-devel
+       - libnsl-devel
+     - require:
+       - coreutils
diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   tdnf update -y
-  tdnf install -y curl wget tar xz  # patchelf
+  tdnf install -y curl wget tar xz # patchelf
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz