From afbdfd92815464e08881475fea922c8b8afa8245 Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Sat, 19 Oct 2024 03:46:03 +0200 Subject: [PATCH] CLD-8147 Fix typo (#28856) --- .github/workflows/e2e-fulltests-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-fulltests-ci.yml b/.github/workflows/e2e-fulltests-ci.yml index 261ca8caf7..4df049636e 100644 --- a/.github/workflows/e2e-fulltests-ci.yml +++ b/.github/workflows/e2e-fulltests-ci.yml @@ -11,11 +11,11 @@ on: required: false PR_NUMBER: type: string - description: The PR number that the ref to test belongs to. Required, If testing a PR. + description: PR number (if applicable) required: false ROLLING_RELEASE_FROM_TAG: type: string - description: Mattermost release git tag to perform a RollingRelease from, before upgrading to the tested ref and perform the full E2E test. Optional. + description: Mattermost release git tag for RollingRelease tests. Optional. required: false MM_ENV: type: string @@ -133,7 +133,7 @@ jobs: COMPUTED_REPORT_TYPE="${REPORT_TYPE}" ### Run sanity assertions after variable generations [ "$REF" = "${_COMMIT_SHA_COMPUTED}" ] # 'inputs.ref' must be a full commit hash, and the commit must exist - [ "$REPORT_TYPE" != "PR" -o "$PR_NUMBER" -gt "0" ] # If report type is PR, then PR_NUMBER must be set to a number + [ "$REPORT_TYPE" != "PR" ] || [ "$PR_NUMBER" -gt "0" ] # If report type is PR, then PR_NUMBER must be set to a number ;; MASTER | MASTER_UNSTABLE | CLOUD | CLOUD_UNSTABLE) ### Populate support variables @@ -184,7 +184,7 @@ jobs: git show-ref --verify "refs/tags/${ROLLING_RELEASE_FROM_TAG}" # 'inputs.ROLLING_RELEASE_FROM_TAG' must be a tag, for release report types fi ENABLED_DOCKER_SERVICES="postgres inbucket minio openldap elasticsearch keycloak" - for SVC_OP in $(tr , ' '<<"$MM_SERVICE_OVERRIDES"); do + for SVC_OP in $(tr , ' '<<<"$MM_SERVICE_OVERRIDES"); do OP=$(cut -c1 <<<$SVC_OP) SVC=$(cut -c2- <<<$SVC_OP) case "$OP" in