Clean up files after initial release and re-enable use of ssh and key

Author: dmurphy18

.github/workflows/release.yml

@@ -113,69 +113,6 @@ jobs:
             .cut_release_changes
           include-hidden-files: true
 
-  ## merge-develop-into-stable:
-  ##   name: Merge develop into stable
-  ##   runs-on: ubuntu-latest
-  ##   needs:
-  ##     - update-main
-  ##   environment: release
-  ##   permissions:
-  ##     contents: write  # To be able to publish the release
-  ##   steps:
-  ##     - uses: actions/checkout@v4
-  ##       with:
-  ##         ref: stable
-  ##         repository: ${{ github.repository }}
-  ##         ssh-key: ${{ secrets.SALT_VMTOOLS_RELEASE_KEY }}
-  ##         fetch-depth: 0
-
-  ##     - name: Configure Git
-  ##       shell: bash
-  ##       run: |
-  ##         git config --global --add safe.directory "$(pwd)"
-  ##         git config --global user.name "Salt Project Packaging"
-  ##         git config --global user.email [email protected]
-  ##         git config --global commit.gpgsign false
-
-  ##     - name: Download Release Details
-  ##       uses: actions/download-artifact@v4
-  ##       with:
-  ##         name: release-details
-
-  ##     - name: Merge develop into stable
-  ##       run: |
-  ##         git merge --no-ff -m "Merge develop into stable for ${{ needs.update-develop.outputs.release-version }} release" origin/develop || touch .git-conflicts
-  ##         if [ -f .git-conflicts ]
-  ##         then
-  ##           git diff
-  ##           for f in $(git status | grep 'both modified' | awk '{ print $3 }')
-  ##           do
-  ##             git checkout --theirs "$f"
-  ##             pre-commit run -av --files "$f"
-  ##             git add "$f"
-  ##           done
-  ##           git commit -a -m "Merge develop into stable for ${{ needs.update-develop.outputs.release-version }} release(auto resolving conflicts to the develop version)"
-  ##         fi
-
-  ##     - name: Tag The ${{ needs.update-develop.outputs.release-version }} Release
-  ##       run: |
-  ##         git tag --no-sign -m "Release ${{ needs.update-develop.outputs.release-version }}" -a ${{ needs.update-develop.outputs.release-version }}
-
-  ##     ## - name: Update svtminion.sh sha256sum's
-  ##     ##   run: |
-  ##     ##     sha256sum svtminion.sh | awk '{ print $1 }' > svtminion.sh.sha256
-  ##     ##     sha256sum svtminion.ps1 | awk '{ print $1 }' > svtminion.ps1.sha256
-  ##     ##     git commit -a -m "Update sha256 checksums" || git commit -a -m "Update sha256 checksums"
-
-  ##     ## - name: Push Changes
-  ##     ##   uses: ad-m/github-push-action@b87afee92c6e70ea888be6203a3e9426fda49839
-  ##     ##   with:
-  ##     ##     ssh: true
-  ##     ##     tags: true
-  ##     ##     atomic: true
-  ##     ##     branch: stable
-  ##     ##     repository: ${{ github.repository }}
-
   publish-release:
     name: Create GitHub Release
     runs-on: ubuntu-latest
@@ -211,7 +148,6 @@ jobs:
 
       - name: Tag The ${{ needs.update-main.outputs.release-version }} Release
         run: |
-          ## DGM git tag --no-sign -m "Release ${{ needs.update-main.outputs.release-version }}" -a ${{ needs.update-main.outputs.release-version }}
           git tag -f --no-sign -m "Release ${{ needs.update-main.outputs.release-version }}" -a ${{ needs.update-main.outputs.release-version }}
 
       - name: Create Github Release
@@ -256,7 +192,6 @@ jobs:
         run: |
           echo "SH=$(sha256sum linux/svtminion.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
           echo "VMTS_VERSION=$(bash linux/svtminion.sh --version | awk '{ print $1 }')" >> "$GITHUB_ENV"
-          echo "DGM  SH ,${SH}, and VMTS_VERSION ,${VMTS_VERSION},"
 
       - uses: actions/checkout@v4
         with:

.github/workflows/test-linux.yml

@@ -46,42 +46,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      ## - name: Install Python Dependencies with pip breakage
-      ##   if: ${{ ( inputs.distro-slug == 'debian-11' ) || ( inputs.distro-slug == 'debian-12' ) || ( inputs.distro-slug == 'debian-13' ) || ( inputs.distro-slug == 'ubuntu-2404' ) }}
-      ##   run: |
-      ##     echo "DGM pip test for distro-slug ${{ inputs.distro-slug }}"
-      ##     echo "DGM doing break-system-packages for distro-slug ${{ inputs.distro-slug }}"
-      ##     python3 -m pip install --break-system-packages -r tests/requirements.txt
-
-      ## - name: Install Python Dependencies without pip breakage
-      ##   if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
-      ##   run: |
-      ##     echo "DGM pip test for distro-slug ${{ inputs.distro-slug }}"
-      ##     echo "DGM plain pip for distro-slug ${{ inputs.distro-slug }}"
-      ##     python3 -m pip install -r tests/requirements.txt
-
-      ## - name: Get Version
-      ##   run: |
-      ##     # We need to get the version here and make it an environment variable
-      ##     # It is used to install via bootstrap and in the test
-      ##     # The version is in the instance name
-      ##     # sed 1st - becomes space, 2nd - becomes dot
-      ##     ## DGM needs cleanup
-      ##     echo "matrix instance ,${{ matrix.instance }},"
-      ##     vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./')
-      ##     vt_parm_ver=$(echo "$vt_parms" | awk -F ' ' '{print $2}')
-      ##     echo "vt parms ,$vt_parms, vt_parms_ver ,$vt_parm_ver,"
-      ##     echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
-
       - name: VMTools Salt
         run: |
           # sed 1st - becomes space, 2nd - becomes dot
-          ## DGM needs cleanup
-          echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /' | sed 's/-/./')
           bt_arg1=$(echo "$bt_parms" | awk -F ' ' '{print $1}')
           bt_arg2=$(echo "$bt_parms" | awk -F ' ' '{print $2}')
-          echo "bt parms ,$bt_parms, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
           bash -x ./linux/svtminion.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test VMTools

tests/linux/test-linux.sh

@@ -219,8 +219,6 @@ cat /etc/salt/minion | grep 'master:\ 192.168.0.5' 1>/dev/null
 ./svtminion.sh --remove || { _retn=$?; echo "test failed, did not uninstall the salt-minion, returned '${_retn}'"; }
 
 # test with classic package installed
-## rpm --import https://repo.saltproject.io/py3/redhat/8/x86_64/3005/SALTSTACK-GPG-KEY.pub # DGM FIX
-## curl -fsSL https://repo.saltproject.io/py3/redhat/8/x86_64/3005.repo | tee /etc/yum.repos.d/salt.repo # DGM FIX
 # Use 3005 Redhat 9 for Rocky 9 container
 rpm --import ${oldpwd}/tests/classic/SALTSTACK-GPG-KEY2.pub
 cp -a ${oldpwd}/tests/classic/3005.repo /etc/yum.repos.d/salt.repo