diff --git a/ci-scripts/Jenkinsfile-GitLab-Container b/ci-scripts/Jenkinsfile-GitLab-Container index f2e4267afe..b949584830 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Container +++ b/ci-scripts/Jenkinsfile-GitLab-Container @@ -289,7 +289,7 @@ pipeline { when { expression {do4Gtest} } steps { script { - triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'LTE-B200-FDD-Mono-LTEBOX-Container') + triggerSlaveJob ('RAN-LTE-FDD-LTEBOX-Container', 'RAN-LTE-FDD-LTEBOX-Container') } } post { @@ -306,10 +306,10 @@ pipeline { } } stage ("LTE-B200-TDD-LTEBOX-Container") { - when { expression {do4Gtest || do5Gtest} } + when { expression {do4Gtest} } steps { script { - triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'LTE-B200-TDD-Mono-LTEBOX-Container') + triggerSlaveJob ('RAN-LTE-TDD-LTEBOX-Container', 'RAN-LTE-TDD-LTEBOX-Container') } } post { diff --git a/ci-scripts/sshconnection.py b/ci-scripts/sshconnection.py index c340603ba1..65a0a0bd67 100644 --- a/ci-scripts/sshconnection.py +++ b/ci-scripts/sshconnection.py @@ -246,7 +246,7 @@ class SSHConnection(): count = 10 copy_status = True elif scp_response == 1 and ignorePermDenied: - logging.warning('Copy was denied but ignored!') + logging.warning(f'copyout(): permission denied, not copying file ({source})') count = 10 copy_status = True else: @@ -258,7 +258,7 @@ class SSHConnection(): count = 10 copy_status = True elif scp_response == 1 and ignorePermDenied: - logging.warning('Copy was denied but ignored!') + logging.warning(f'copyout(): permission denied, not copying file ({source})') count = 10 copy_status = True else: