skip python build

saltstack · Nov 23, 2024 · 9f44336 · 9f44336
1 parent cc25a51
commit 9f44336
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/custom/testing/systemd-amazonlinux-2023.Dockerfile b/custom/testing/systemd-amazonlinux-2023.Dockerfile
@@ -20,13 +20,20 @@ RUN <<EOF
   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 python
+#  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
 
+<<<<<<< Updated upstream
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree
   rm -rf golden-state-tree
   rm -rf /tmp/*
+=======
+#  rm -rf salt
+#  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+#  rm -rf golden-pillar-tree
+#  rm -rf golden-state-tree
+>>>>>>> Stashed changes
 
   mv /usr/bin/tail /usr/bin/tail.real
 EOF