Merge pull request #4148 from zowe/user/markackert/v2x-scp-fix

Fix scp errors in v2 automation, update upload-artifact
zowe · Jan 28, 2025 · 09b9e3e · 09b9e3e
2 parents 7a0543c + 09f6ffe
commit 09b9e3e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml
@@ -392,7 +392,7 @@ jobs:
 
       - name: '[After Test 2] Upload test report'
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: InstallTestReports-${{ env.TEST_NAME }}-${{ steps.more-test-prep.outputs.TEST_SERVER_NICKNAME }}-${{ github.run_id }}-${{ env.CURRENT_TIME }}
           path: ${{ env.INSTALL_TEST_PATH }}/reports/

diff --git a/.github/workflows/diff-schema.yml b/.github/workflows/diff-schema.yml
@@ -34,7 +34,7 @@ jobs:
       - name: '[Build] Make diff'
         run: git diff ${{ env.FROM }} ${{ env.TO }} -- schemas > schemas.diff
       - name: '[Upload]'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: schemas.diff
           path: schemas.diff

diff --git a/.github/workflows/diff-yaml b/.github/workflows/diff-yaml
@@ -34,7 +34,7 @@ jobs:
       - name: '[Build] Make diff'
         run: git diff ${{ env.FROM }} ${{ env.TO }} -- example-zowe.yaml > example-yaml.diff
       - name: '[Upload]'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: example-yaml.diff
           path: example-yaml.diff

diff --git a/playbooks/roles/common/templates/scp.with-key.sh.j2 b/playbooks/roles/common/templates/scp.with-key.sh.j2
@@ -4,4 +4,4 @@ FILE_LOCAL=$1
 FILE_REMOTE=$2
 
 echo "SCP $FILE_LOCAL ==> $FILE_REMOTE"
-scp -oHostKeyAlgorithms=+ssh-rsa -P {{ hostvars[inventory_hostname].ansible_port | default('22') }} -i {{ hostvars[inventory_hostname].ansible_ssh_private_key_file }} $FILE_LOCAL {{ hostvars[inventory_hostname].ansible_user }}@{{ hostvars[inventory_hostname].ansible_ssh_host }}:$FILE_REMOTE
+scp -O -oHostKeyAlgorithms=+ssh-rsa -P {{ hostvars[inventory_hostname].ansible_port | default('22') }} -i {{ hostvars[inventory_hostname].ansible_ssh_private_key_file }} $FILE_LOCAL {{ hostvars[inventory_hostname].ansible_user }}@{{ hostvars[inventory_hostname].ansible_ssh_host }}:$FILE_REMOTE
diff --git a/playbooks/roles/common/templates/scp.with-pwd.sh.j2 b/playbooks/roles/common/templates/scp.with-pwd.sh.j2
@@ -4,4 +4,4 @@ FILE_LOCAL=$1
 FILE_REMOTE=$2
 
 echo "SCP $FILE_LOCAL ==> $FILE_REMOTE"
-sshpass -p "{{ hostvars[inventory_hostname].ansible_password }}" scp -oHostKeyAlgorithms=+ssh-rsa -P {{ hostvars[inventory_hostname].ansible_port | default('22') }} $FILE_LOCAL {{ hostvars[inventory_hostname].ansible_user }}@{{ hostvars[inventory_hostname].ansible_ssh_host }}:$FILE_REMOTE
+sshpass -p "{{ hostvars[inventory_hostname].ansible_password }}" scp -O -oHostKeyAlgorithms=+ssh-rsa -P {{ hostvars[inventory_hostname].ansible_port | default('22') }} $FILE_LOCAL {{ hostvars[inventory_hostname].ansible_user }}@{{ hostvars[inventory_hostname].ansible_ssh_host }}:$FILE_REMOTE