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.

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

[stable-4.9] Update docs links access.redhat.com -> docs.redhat.com (#5002) #5033

Merged
merged 2 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:
- name: "Set variables for screenshots"
if: matrix.test == 'screenshots'
run: |
UI_COMMIT_MAIN=`curl -s https://api.github.com/repos/ansible/ansible-hub-ui/branches/${SHORT_BRANCH} | jq -r .commit.sha`
echo "UI_COMMIT_MAIN=${UI_COMMIT_MAIN}" >> $GITHUB_ENV
UI_COMMIT_BASE=`curl -s https://api.github.com/repos/ansible/ansible-hub-ui/branches/${SHORT_BRANCH} | jq -r .commit.sha`
echo "UI_COMMIT_BASE=${UI_COMMIT_BASE}" >> $GITHUB_ENV
COMPARE_SCREENSHOTS=${{ github.event_name == 'pull_request' }}
echo 'compare screenshots:'
Expand Down Expand Up @@ -190,19 +190,19 @@ jobs:
run: |
diff -Naur <(ls test/cypress/e2e | sort) <(yq '.jobs.cypress.strategy.matrix.test[]' .github/workflows/cypress.yml | sort)
- name: "Cache original screenshots"
- name: "Cache base screenshots"
if: matrix.test == 'screenshots'
uses: actions/cache@v4
with:
path: ansible-hub-ui/test/screenshots-main/
key: screenshots-${{env.SHORT_BRANCH}}-${{ env.UI_COMMIT_MAIN }}
path: ansible-hub-ui/test/screenshots-base/
key: screenshots-${{env.SHORT_BRANCH}}-${{ env.UI_COMMIT_BASE }}
restore-keys: |
screenshots-${{env.SHORT_BRANCH}}-
- name: "List cached screenshots"
if: ${{ matrix.test == 'screenshots' && env.COMPARE_SCREENSHOTS == 'true' }}
run: |
ls ansible-hub-ui/test/screenshots-main/
ls ansible-hub-ui/test/screenshots-base/
- name: "Run cypress"
working-directory: 'ansible-hub-ui/test'
Expand All @@ -227,7 +227,7 @@ jobs:
run: |
changed=false
for orig in screenshots-main/*; do
for orig in screenshots-base/*; do
echo $orig
new=cypress/screenshots/screenshots/screenshots.js/"$(basename "$orig")"
diff=cypress/screenshots/screenshots/diff--"$(basename "$orig")"
Expand All @@ -250,8 +250,8 @@ jobs:
if: ${{ matrix.test == 'screenshots' && env.COMPARE_SCREENSHOTS == 'false' }}
working-directory: 'ansible-hub-ui/test'
run: |
rm -rf screenshots-main/
mv cypress/screenshots/screenshots/screenshots.js ./screenshots-main
rm -rf screenshots-base/
mv cypress/screenshots/screenshots/screenshots.js ./screenshots-base
- uses: actions/upload-artifact@v4
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const gitCommit =
execSync('git rev-parse HEAD', { encoding: 'utf-8' }).trim();

const docsURL =
'https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4';
'https://docs.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4';

// Default user defined settings
const defaultConfigs = [
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/e2e/misc/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('Hub Menu Tests', () => {
cy.menuPresent('Documentation').should(
'have.attr',
'href',
'https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4',
'https://docs.redhat.com/documentation/en-us/red_hat_ansible_automation_platform/2.4',
);
});
});
Expand Down
Loading