Skip to content

Commit 66397e4

Browse files
committed
Hotfix update that includes some minor bug fixes and improvements in docs (Azure#62)
1 parent 3a276d2 commit 66397e4

38 files changed

+561
-271
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ updates:
66
directory: /
77
schedule:
88
interval: daily
9+
ignore:
10+
- dependency-name: "*"
11+
update-types: ["version-update:semver-minor"]
912

1013
- package-ecosystem: pip
1114
directory: /
1215
schedule:
1316
interval: daily
17+
ignore:
18+
- dependency-name: "*"
19+
update-types: ["version-update:semver-minor"]

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747

4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
49+
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
5050
with:
5151
languages: ${{ matrix.language }}
5252

5353
- name: Autobuild
54-
uses: github/codeql-action/autobuild@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
54+
uses: github/codeql-action/autobuild@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
5555

5656
- name: Perform CodeQL Analysis
57-
uses: github/codeql-action/analyze@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
57+
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
5858
with:
5959
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scoreboard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ jobs:
5050
retention-days: 5
5151

5252
- name: "Upload to code-scanning"
53-
uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
53+
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
5454
with:
5555
sarif_file: results.sarif

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
output: report-fs.sarif
3737

3838
- name: Upload Trivy report (fs) GitHub Security
39-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
39+
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
4040
with:
4141
sarif_file: report-fs.sarif
4242
category: 'fs'

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
# SAP Testing Automation Framework
22

3+
![SAP Testing Automation Framework](./docs/images/sap-automation-qa.svg)
4+
35
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
46
[![Azure](https://img.shields.io/badge/Microsoft-SAP%20on%20Azure-0078D4?logo=microsoft)](https://docs.microsoft.com/azure/sap)
57
[![Python Coverage](https://img.shields.io/badge/Code%20Coverage-85%25-success?logo=python&logoColor=white)](https://github.com/Azure/sap-automation-qa/actions/workflows/github-actions-code-coverage.yml)
68
[![Ansible Lint](https://github.com/Azure/sap-automation-qa/actions/workflows/github-actions-ansible-lint.yml/badge.svg)](https://github.com/Azure/sap-automation-qa/actions/workflows/github-actions-ansible-lint.yml)
79
[![OpenSSF Scorecard](https://img.shields.io/ossf-scorecard/github.com/Azure/sap-automation-qa)](https://scorecard.dev/viewer/?uri=github.com/Azure/sap-automation-qa)
10+
[![GitHub Issues](https://img.shields.io/github/issues/Azure/sap-automation-qa)](https://github.com/Azure/sap-automation-qa/issues)
811

912
## 🔍 Overview
1013

1114
The SAP Testing Automation Framework is an open-source orchestration tool designed to validate SAP deployments on Microsoft Azure. It enables you to assess system configurations against SAP on Azure best practices and guidelines. Additionally, the framework facilitates automation for various testing scenarios, including High Availability (HA) functional testing.
1215

1316
> **NOTE**: This repository is currently in private preview and is intended for testing and feedback purposes. As this is an early release, it is not yet production-ready, and breaking changes can be introduced at any time.
1417
18+
![SAP Testing Automation Framework](./docs/images/sap-testing-automation-framework.png)
19+
1520
## Supported Configuration Matrix
1621

1722
The following SAP components are supported in a two-node Pacemaker cluster running on SUSE Linux Enterprise Server (SLES) or Red Hat Enterprise Linux (RHEL):

docs/HIGH_AVAILABILITY.md

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Currently SAP Testing Automation Framework is supported for below Linux distros
2020
| Component | Type | Cluster Type | Storage |
2121
|-----------|------|--------------|---------|
2222
| SAP Central Services | ENSA1 or ENSA2 | Azure Fencing Agent | Azure Files or ANF |
23+
| SAP Central Services | ENSA1 or ENSA2 | ISCSI (SBD device) | Azure Files or ANF |
2324
| SAP HANA | Scale-up | Azure Fencing Agent | Azure Managed Disk or ANF |
2425
| SAP HANA | Scale-up | ISCSI (SBD device) | Azure Managed Disk or ANF |
2526

@@ -36,6 +37,15 @@ To run the SAP Testing Automation Framework, you must meet certain prerequisites
3637
- [SAP HANA high availability on Azure Virtual Machine](https://learn.microsoft.com/azure/sap/workloads/sap-high-availability-guide-start).
3738
- [SAP Netweaver high availability on Azure Virtual Machine](https://learn.microsoft.com/azure/sap/workloads/sap-high-availability-guide-start)
3839

40+
### Enabling Cluster Services on Boot
41+
42+
Before executing the tests, ensure that the cluster services are configured to start automatically during system boot. Run the following command on one of the cluster nodes to enable this setting. The `--all` option ensures that the cluster services are enabled on all nodes within the cluster.
43+
44+
```bash
45+
crm cluster enable --all # for SUSE virtual machines
46+
pcs cluster enable --all # for RedHat virtual machine
47+
```
48+
3949
### Management server
4050

4151
The SAP Testing Automation Framework requires a jumpbox or management server with the following setup:
@@ -85,14 +95,17 @@ To set up your enviroment in management server, follow these steps:
8595

8696
Ensure you are logged into the Ubuntu management server that is connected to the SAP system's virtual network.
8797

88-
1.2. **Clone the repository**:
98+
1.2. **Fork and clone the repository**:
8999

90100
```bash
91101
# sudo to root
92102
sudo su -
93103

94-
# Clone the repository
95-
git clone https://github.com/Azure/sap-automation-qa.git
104+
# First, visit https://github.com/Azure/sap-automation-qa in your browser
105+
# Click the "Fork" button in the top-right corner to create a fork in your GitHub account
106+
107+
# Clone your fork of the repository (replace GITHUB-USERNAME with your GitHub username)
108+
git clone https://github.com/GITHUB-USERNAME/sap-automation-qa.git
96109
cd sap-automation-qa
97110
```
98111

@@ -271,6 +284,51 @@ Test results and logs can be found in:
271284
cd WORKSPACES/SYSTEM/<SYSTEM_CONFIG_NAME>/quality_assurance/
272285
```
273286

287+
## Update the framework
288+
289+
To ensure you have the latest features and fixes, it's important to keep your fork of the SAP Testing Automation Framework up to date. You can do this by pulling the latest changes from the original repository into your fork.
290+
291+
### Steps to update your fork
292+
293+
1. **Ensure you have the upstream repository configured**:
294+
295+
```bash
296+
# Check if you already have the upstream remote
297+
git remote -v
298+
299+
# If you don't see an 'upstream' entry, add it
300+
git remote add upstream https://github.com/Azure/sap-automation-qa.git
301+
```
302+
303+
2. **Fetch the latest changes from the upstream repository**:
304+
305+
```bash
306+
git fetch upstream
307+
```
308+
309+
3. **Ensure you're on your main branch**:
310+
311+
```bash
312+
git checkout main
313+
```
314+
315+
4. **Merge the changes from upstream into your local fork**:
316+
317+
```bash
318+
git merge upstream/main
319+
```
320+
321+
5. **Push the updated code to your GitHub fork**:
322+
323+
```bash
324+
git push origin main
325+
```
326+
327+
This process will update your fork with all the latest features, bug fixes, and improvements from the original SAP Testing Automation Framework repository.
328+
329+
> [!NOTE]
330+
> If you've made local changes to your fork, you might encounter merge conflicts during step 4. In that case, you'll need to resolve these conflicts before proceeding with the push in step 5.
331+
274332
## Additional Resources
275333

276334
- [Azure SAP Documentation](https://docs.microsoft.com/azure/sap)

docs/images/sap-automation-qa.svg

Lines changed: 1 addition & 0 deletions
Loading
615 KB
Loading

requirements.in

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Ansible packages
2+
ansible-core
3+
ansible-lint
4+
ansible-runner
5+
6+
# Azure packages
7+
azure-identity
8+
azure-kusto-data
9+
azure-kusto-ingest
10+
azure-mgmt-network
11+
azure-storage-blob
12+
azure-storage-queue
13+
14+
# Development tools
15+
black
16+
pylint
17+
coverage
18+
19+
# Testing packages
20+
pytest
21+
pytest-cov
22+
pytest-mock
23+
24+
# Data processing
25+
numpy
26+
pandas
27+
28+
# Core utilities
29+
Jinja2
30+
PyYAML
31+
requests
32+
33+
# CLI tools
34+
click
35+
rich

0 commit comments

Comments
 (0)