Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: skip open attribute list step on e2e #3481

Merged
merged 4 commits into from
Dec 27, 2023
Merged

fix: skip open attribute list step on e2e #3481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4696708
fix: skip open attribute list step on e2e
danielbdias Dec 27, 2023
5ddb379
adding quiet-pull option to avoid noisy logs on GH actions
danielbdias Dec 27, 2023
bf89735
disable github cache temporarily
danielbdias Dec 27, 2023
780d549
removing cache from gh action
danielbdias Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 8 additions & 43 deletions .github/workflows/pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,80 +146,45 @@ jobs:
with:
fetch-depth: 0

- name: set cache keys
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our cache is causing false positives and negatives during our tests, causing our tests not to capture changes that should break tests.

This allowed us to merge a PR with a false negative test (the PR that changed the behavior of the Trace tab) and blocked this PR with a false positive.

shell: bash
run: |
echo "WEB_CACHE_KEY=$(git log --pretty=tformat:"%H" -n1 web)" >> $GITHUB_ENV
echo "SERVER_CACHE_KEY=$(git log --pretty=tformat:"%H" -n1 server)" >> $GITHUB_ENV
echo "CLI_CACHE_KEY=$(git log --pretty=tformat:"%H" -n1 cli)" >> $GITHUB_ENV

# web
- name: Cache Web Build
id: cache-web-build
uses: actions/cache@v3
with:
path: web/build/
key: web-build-${{ env.WEB_CACHE_KEY }}

- name: Setup node
# if cache miss
if: steps.cache-web-build.outputs.cache-hit != 'true'
uses: actions/setup-node@v3
with:
node-version: 16
cache: npm
cache-dependency-path: web/package-lock.json

- name: Cache dependencies
id: cache-nodemodules
# if cache miss
if: steps.cache-web-build.outputs.cache-hit != 'true'
uses: actions/cache@v3
with:
path: |
web/node_modules
/home/runner/.cache/Cypress
key: npm--${{ hashFiles('web/package-lock.json') }}
restore-keys: npm-

- name: Install dependencies
run: cd web/; npm ci
# if cache miss for build and deps
if: steps.cache-web-build.outputs.cache-hit != 'true' && steps.cache-nodemodules.outputs.cache-hit != 'true'

- run: cd web; CI= npm run build
if: steps.cache-web-build.outputs.cache-hit != 'true'
- name: Build UI
run: cd web; CI= npm run build

# go+docker
- name: Cache Build
id: cache-docker-build
uses: actions/cache@v3
with:
path: dist/
key: dist-${{env.SERVER_CACHE_KEY }}-${{env.CLI_CACHE_KEY }}-${{ hashFiles('.goreleaser.dev.yaml', 'Dockerfile') }}
- name: Setup go
if: steps.cache-docker-build.outputs.cache-hit != 'true'
uses: actions/setup-go@v3
with:
go-version-file: "go.mod"
cache: true
cache-dependency-path: "go.mod"
- uses: goreleaser/goreleaser-action@v4
if: steps.cache-docker-build.outputs.cache-hit != 'true'

- name: Release Go binaries
uses: goreleaser/goreleaser-action@v4
with:
distribution: goreleaser-pro
version: v1.22.0
args: release --skip=announce --snapshot -f .goreleaser.dev.yaml

- name: Move binaries to known location
if: steps.cache-docker-build.outputs.cache-hit != 'true'
run: |
find ./dist -name 'tracetest' -exec cp {} ./dist \;
find ./dist -name 'tracetest-server' -exec cp {} ./dist \;
chmod +x ./dist/tracetest ./dist/tracetest-server

- name: Export docker image
if: steps.cache-docker-build.outputs.cache-hit != 'true'
run: |
docker save --output dist/image.tar "kubeshop/tracetest:$TAG"

- name: Upload assets
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ build() {
}

up() {
docker compose $opts up -d --remove-orphans
docker compose $opts up --detach --remove-orphans --quiet-pull
}

stop() {
Expand Down
6 changes: 3 additions & 3 deletions web/cypress/e2e/TestRunDetail/Outputs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('Outputs', () => {
// Open output flow from the Trace view (attributes)
cy.selectRunDetailMode(2);
cy.get('[data-cy=trace-node-database]', {timeout: 25000}).first().click({force: true});
cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]', {timeout: 25000}).click({force: true});
// cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]', {timeout: 25000}).click({force: true});
cy.get('[data-cy=attributes-search-container] input').type('db.name');
cy.get('[data-cy=attribute-row-db-name] .ant-dropdown-trigger').click();
cy.contains('Create test output').click();
Expand Down Expand Up @@ -46,7 +46,7 @@ describe('Outputs', () => {
// Open output flow from the Trace view (attributes)
cy.selectRunDetailMode(2);
cy.get('[data-cy=trace-node-database]', {timeout: 25000}).first().click({force: true});
cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]', {timeout: 25000}).click({force: true});
// cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]', {timeout: 25000}).click({force: true});
cy.get('[data-cy=attributes-search-container] input').type('db.name');
cy.get('[data-cy=attribute-row-db-name] .ant-dropdown-trigger').click();
cy.contains('Create test output').click();
Expand Down Expand Up @@ -89,7 +89,7 @@ describe('Outputs', () => {
// Open output flow from the Trace view (attributes)
cy.selectRunDetailMode(2);
cy.get('[data-cy=trace-node-database]', {timeout: 25000}).first().click({force: true});
cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]', {timeout: 25000}).click({force: true});
// cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]', {timeout: 25000}).click({force: true});
cy.get('[data-cy=attributes-search-container] input').type('db.name');
cy.get('[data-cy=attribute-row-db-name] .ant-dropdown-trigger').click();
cy.contains('Create test output').click();
Expand Down
4 changes: 2 additions & 2 deletions web/cypress/e2e/TestRunDetail/TestRunDetail.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe('Test Run Detail Views', () => {
it('Trace view -> show the attribute list for a specific span', () => {
cy.selectRunDetailMode(2);
cy.get('[data-cy=trace-node-http]').click();
cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]').click();
// cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]').click();

cy.get('[data-cy=attribute-list]').should('be.visible');
cy.get('[data-cy=attribute-row-http-method]').should('be.visible');
Expand All @@ -16,7 +16,7 @@ describe('Test Run Detail Views', () => {
it('Trace view -> attribute list', () => {
cy.selectRunDetailMode(2);
cy.get('[data-cy=trace-node-http]').click();
cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]').click();
// cy.get('[data-cy=toggle-drawer-SPAN_DETAILS]').click();

cy.get('[data-cy=attribute-list]').should('be.visible');
});
Expand Down