From 6f4e56b5b9c849b4d6645b12fb65a277bceff9d8 Mon Sep 17 00:00:00 2001 From: Ryan Melton Date: Thu, 28 Nov 2024 16:51:09 -0700 Subject: [PATCH] Address CICD issues --- .github/workflows/spelling.yml | 14 +++++++------- openc3-cosmos-init/Dockerfile | 2 ++ playwright/tests/wait-for-build.spec.ts | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index a1867c3ee8..e09fa3f10f 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -11,10 +11,10 @@ jobs: name: Codespell runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: codespell-project/actions-codespell@v2 - with: - # Skip generated code as well as cstol_converter which has false - # positivies on ADN and Adn - skip: ./docs,*.map,*.min.js,*.pem,*.bin,cstol_converter - ignore_words_file: .whitelist \ No newline at end of file + - uses: actions/checkout@v4 + - uses: codespell-project/actions-codespell@v2 + with: + # Skip generated code as well as cstol_converter which has false + # positivies on ADN and Adn + skip: ./docs,*.map,*.min.js,*.pem,*.bin,cstol_converter,vue.global.*,vuetify-labs* + ignore_words_file: .whitelist diff --git a/openc3-cosmos-init/Dockerfile b/openc3-cosmos-init/Dockerfile index fed293edb4..168882fbea 100644 --- a/openc3-cosmos-init/Dockerfile +++ b/openc3-cosmos-init/Dockerfile @@ -118,6 +118,8 @@ RUN ["/openc3/plugins/docker-package-build.sh", "openc3-cosmos-tool-docs"] FROM ${OPENC3_REGISTRY}/${OPENC3_NAMESPACE}/${OPENC3_BASE_IMAGE}:${OPENC3_TAG} +USER ${USER_ID}:${GROUP_ID} + COPY --from=openc3-tmp1 --chown=${IMAGE_USER}:${IMAGE_GROUP} /openc3/plugins/packages/openc3-cosmos-ace-diff/ /openc3/plugins/packages/openc3-cosmos-ace-diff/ COPY --from=openc3-tmp1 --chown=${IMAGE_USER}:${IMAGE_GROUP} /openc3/plugins/gems/* /openc3/plugins/gems/ COPY --from=openc3-tmp2 --chown=${IMAGE_USER}:${IMAGE_GROUP} /openc3/plugins/gems/* /openc3/plugins/gems/ diff --git a/playwright/tests/wait-for-build.spec.ts b/playwright/tests/wait-for-build.spec.ts index 906e5545c5..bb09e5ab9e 100644 --- a/playwright/tests/wait-for-build.spec.ts +++ b/playwright/tests/wait-for-build.spec.ts @@ -28,12 +28,12 @@ test('waits for the services to deploy and connect', async ({ await expect(page.locator('.v-app-bar')).toContainText('CmdTlmServer') // Check the 3rd column (nth starts at 0) on the row containing INST_INT says CONNECTED await expect( - page.locator('tr:has-text("INST_INT") td >> nth=2'), + page.locator('[data-test="interfaces-table"]').locator('tr:has-text("INST_INT") td >> nth=2'), ).toContainText('CONNECTED', { timeout: 120000, }) await expect( - page.locator('tr:has-text("INST2_INT") td >> nth=2'), + page.locator('[data-test="interfaces-table"]').locator('tr:has-text("INST2_INT") td >> nth=2'), ).toContainText('CONNECTED', { timeout: 60000, })