Install python to /usr/local

saltstack · Nov 13, 2024 · b3b7470 · b3b7470
1 parent 9a49344
commit b3b7470
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 82 deletions.
diff --git a/custom/testing/amazonlinux-2023.Dockerfile b/custom/testing/amazonlinux-2023.Dockerfile
@@ -7,17 +7,21 @@ SHELL ["/bin/bash", "-c"]
 
 RUN <<EOF
   set -e
+
   if [ $(uname -m) = "x86_64" ]; then
     export ARCH=x86_64
   else
     export ARCH=arm64
   fi
+
   yum update -y
-  yum install -y epel-release
-  yum install -y curl wget tar xz patchelf
+  yum install -y wget tar xz patchelf util-linux openssl openssl-pkcs11
+
   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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree

diff --git a/custom/testing/debian-13.Dockerfile b/custom/testing/debian-13.Dockerfile
diff --git a/custom/testing/golden-state-tree/os/amazon/init.sls b/custom/testing/golden-state-tree/os/amazon/init.sls
@@ -1,7 +1,3 @@
 include:
   - .config
   - .pkgs
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/amazon2023/init.sls b/custom/testing/golden-state-tree/os/amazon2023/init.sls
@@ -1,7 +1,4 @@
 include:
   - .config
   - .pkgs
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
+  - python
diff --git a/custom/testing/golden-state-tree/os/amazon2023/pkgs/init.sls b/custom/testing/golden-state-tree/os/amazon2023/pkgs/init.sls
@@ -7,7 +7,7 @@ include:
   - pkgs.gpg
   - pkgs.libcurl
   - pkgs.libffi
-  - pkgs.libsodium-compile
+{#-  - pkgs.libsodium-compile #}
   - pkgs.libxml
   - pkgs.libxslt
   - pkgs.make
@@ -37,5 +37,5 @@ include:
 
   {#- OS Specific packages install #}
   {%- if grains['osarch'] not in ('amd64', 'armhf', 'arm64') %}
-  - .docker
+{#-  - .docker #}
   {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/debian/config/init.sls b/custom/testing/golden-state-tree/os/debian/config/init.sls
@@ -4,6 +4,8 @@ include:
   - config.ulimits
   - config.locale
   - config.sssd
+  {#-
   - config.timezone
   - config.dhclient
   - config.sshd_config
+  #}
diff --git a/custom/testing/golden-state-tree/os/debian/init.sls b/custom/testing/golden-state-tree/os/debian/init.sls
@@ -1,7 +1,4 @@
 include:
   - .config
   - .pkgs
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
+  - python
diff --git a/custom/testing/golden-state-tree/os/fedora/init.sls b/custom/testing/golden-state-tree/os/fedora/init.sls
@@ -2,7 +2,3 @@ include:
   - .config
   - .pkgs
   - python
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/photon/init.sls b/custom/testing/golden-state-tree/os/photon/init.sls
@@ -1,11 +1,4 @@
-
-
-
 include:
   - .config
   - .pkgs
   - python
-
-  {%- if pillar.get('github_actions_runner', False) %}
-  - github-actions-runner
-  {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/rocky/config/init.sls b/custom/testing/golden-state-tree/os/rocky/config/init.sls
@@ -3,6 +3,8 @@ include:
   - config.ulimits
   - config.locale
   - config.sssd
+{#-
   - config.timezone
   - config.dhclient
   - config.sshd_config
+#}
diff --git a/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls b/custom/testing/golden-state-tree/os/rocky/pkgs/init.sls
@@ -4,7 +4,7 @@ include:
   - pkgs.curl
   - pkgs.dmidecode
   - pkgs.dnsutils
-  - pkgs.docker
+{#-  - pkgs.docker #}
   - pkgs.gcc
   - pkgs.gpg
   - pkgs.ipset

diff --git a/custom/testing/golden-state-tree/python/amazon_dependencies.sls b/custom/testing/golden-state-tree/python/amazon_dependencies.sls
@@ -1,17 +1,3 @@
-# Install dnf config manager
-install_config_command:
-  cmd.run:
-    - name: dnf install -y 'dnf-command(config-manager)'
-
-
-# Use config manager to enable powertools repo. This is needed for libnsl2-devel
-enable_powertools_repo:
-  cmd.run:
-    - name: dnf config-manager --set-enabled powertools
-    - require:
-      - install_config_command
-
-
 python_dependencies:
    pkg.latest:
      - pkgs:
@@ -29,6 +15,3 @@ python_dependencies:
        - gdbm-devel
        - sqlite-devel
        - xz-devel
-       - libnsl2-devel
-     - require:
-       - enable_powertools_repo
diff --git a/custom/testing/golden-state-tree/python/init.sls b/custom/testing/golden-state-tree/python/init.sls
@@ -11,9 +11,9 @@ include:
   {%- elif grains['os'] == 'Fedora' %}
   - .fedora_dependencies
   {%- elif grains.get("oscodename") == 'Amazon Linux 2' %}
-  - .rocky_dependencies
+  - .amazon_dependencies
   {%- elif grains.get("osfinger") == 'Amazon Linux-2023' %}
-  - .rocky_dependencies
+  - .amazon_dependencies
   {%- elif grains['os'] == 'VMware Photon OS' %}
   - .photon_dependencies
   {%- elif grains['os'] == 'Debian' %}

diff --git a/custom/testing/rockylinux-8.Dockerfile b/custom/testing/rockylinux-8.Dockerfile
@@ -7,17 +7,22 @@ SHELL ["/bin/bash", "-c"]
 
 RUN <<EOF
   set -e
+
   if [ $(uname -m) = "x86_64" ]; then
     export ARCH=x86_64
   else
     export ARCH=arm64
   fi
+
   yum update -y
   yum install -y epel-release
   yum 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree