Skip to content

Commit

Permalink
workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
eytannnaim committed Nov 2, 2023
1 parent cfe6d14 commit 9683288
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dsf_poc_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
name: '${{ matrix.name }}'
runs-on: ubuntu-latest
env:
EXAMPLE_DIR: ./examples/poc/dsf_deployment
EXAMPLE_DIR: ./examples/aws/poc/dsf_deployment
AWS_REGION: eu-west-2
TF_VAR_enable_sonar: ${{ matrix.enable_sonar }}
TF_VAR_enable_dam: ${{ matrix.enable_dam }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dsf_poc_cli_azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
name: '${{ matrix.name }}'
runs-on: ubuntu-latest
env:
EXAMPLE_DIR: ./examples/azure/dsf_deployment
EXAMPLE_DIR: ./examples/azure/poc/dsf_deployment
environment: test

# Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dsf_single_account_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
TF_CLI_ARGS: "-no-color"
TF_INPUT: 0
TF_VAR_gw_count: 1
EXAMPLE_DIR: ./examples/installation/dsf_single_account_deployment
EXAMPLE_DIR: ./examples/aws/installation/dsf_single_account_deployment
AWS_REGION: ap-southeast-1
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_sonar_poc_basic_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
TF_CLI_ARGS: "-no-color"
TF_INPUT: 0
TF_VAR_gw_count: 2
EXAMPLE_DIR: ./examples/poc/sonar_basic_deployment
EXAMPLE_DIR: ./examples/aws/poc/sonar_basic_deployment
AWS_REGION: eu-west-2
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/plan_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ on:
paths-ignore:
- '.github/**'
- 'modules/aws/sonar-upgrader/**'
- 'examples/sonar_upgrade/*'
- 'examples/aws/sonar_upgrade/*'
- 'installer_machine/*'
- 'dsf_instances_permissions_samples/*'
- 'permissions_samples/*'
Expand All @@ -62,7 +62,7 @@ jobs:
matrix:
include:
- name: Azure - POC - DSF
example: ./examples/azure/dsf_deployment
example: ./examples/azure/poc/dsf_deployment
terraformvars: |
resource_group_location = "East US"
tarball_location = {
Expand All @@ -72,19 +72,19 @@ jobs:
az_blob = "dummy-blob"
}
- name: AWS - POC - DSF
example: ./examples/poc/dsf_deployment
example: ./examples/aws/poc/dsf_deployment
terraformvars: |
dam_license="license.mprv"
- name: AWS - POC - Sonar Basic
example: ./examples/poc/sonar_basic_deployment
example: ./examples/aws/poc/sonar_basic_deployment
- name: AWS - POC - Sonar HADR
example: ./examples/poc/sonar_hadr_deployment
example: ./examples/aws/poc/sonar_hadr_deployment
- name: AWS - Installation - Sonar Single Account
example: ./examples/installation/sonar_single_account_deployment
example: ./examples/aws/installation/sonar_single_account_deployment
- name: AWS - Installation - Sonar Multi Account
example: ./examples/installation/sonar_multi_account_deployment
example: ./examples/aws/installation/sonar_multi_account_deployment
- name: AWS - Installation - DSF Single Account
example: ./examples/installation/dsf_single_account_deployment
example: ./examples/aws/installation/dsf_single_account_deployment

name: '${{ matrix.name }}'
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ on:
- 'dev'
paths:
- 'modules/aws/sonar-upgrader/*'
- 'examples/sonar_upgrade/*'
- 'examples/aws/sonar_upgrade/*'

env:
TF_CLI_ARGS: "-no-color"
Expand Down Expand Up @@ -61,8 +61,8 @@ jobs:
name: '${{ matrix.name }}'
runs-on: ubuntu-latest
env:
DEPLOYMENT_EXAMPLE_DIR: ./examples/poc/dsf_deployment
UPGRADE_EXAMPLE_DIR: ./examples/sonar_upgrade
DEPLOYMENT_EXAMPLE_DIR: ./examples/aws/poc/dsf_deployment
UPGRADE_EXAMPLE_DIR: ./examples/aws/sonar_upgrade
AWS_REGION: eu-west-2
SONAR_TARGET_VERSION: 4.13.0.10.0
TF_VAR_enable_sonar: ${{ matrix.enable_sonar }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar_multi_account_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
TF_CLI_ARGS: "-no-color"
TF_INPUT: 0
TF_VAR_gw_count: 1
EXAMPLE_DIR: ./examples/installation/sonar_multi_account_deployment
EXAMPLE_DIR: ./examples/aws/installation/sonar_multi_account_deployment
AWS_REGION: ap-southeast-1
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sonar_poc_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ on:
- 'modules/aws/rds-mysql-db/*'
- 'modules/null/federation/*'
- 'modules/null/hadr/*'
- 'examples/poc/sonar_basic_deployment/*'
- 'examples/poc/sonar_hadr_deployment/*'
- 'examples/aws/poc/sonar_basic_deployment/*'
- 'examples/aws/poc/sonar_hadr_deployment/*'

pull_request:
types:
Expand All @@ -57,8 +57,8 @@ on:
- 'modules/aws/rds-mysql-db/*'
- 'modules/null/federation/*'
- 'modules/null/hadr/*'
- 'examples/poc/sonar_basic_deployment/*'
- 'examples/poc/sonar_hadr_deployment/*'
- 'examples/aws/poc/sonar_basic_deployment/*'
- 'examples/aws/poc/sonar_hadr_deployment/*'

env:
TF_CLI_ARGS: "-no-color"
Expand All @@ -77,12 +77,12 @@ jobs:
matrix:
include:
- workspace: basic_cli-${{ github.run_number }}-${{ github.run_attempt }}
example_dir: ./examples/poc/sonar_basic_deployment
example_dir: ./examples/aws/poc/sonar_basic_deployment
aws_region: eu-west-2
hub_output: '.dsf_hub.value.public_dns'
gw_output: '.dsf_agentless_gw.value."agentless-gw-0".private_ip'
- workspace: hadr_cli-${{ github.run_number }}-${{ github.run_attempt }}
example_dir: ./examples/poc/sonar_hadr_deployment
example_dir: ./examples/aws/poc/sonar_hadr_deployment
aws_region: eu-west-1
hub_output: '.dsf_hubs.value.main.public_dns'
gw_output: '.dsf_agentless_gw.value."agentless-gw-0".main.private_ip'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar_single_account_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
matrix:
include:
- name: single account
example_dir: examples/installation/sonar_single_account_deployment
example_dir: examples/aws/installation/sonar_single_account_deployment
target_dir: single_account

name: '${{ matrix.name }} ${{ inputs.branch }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar_upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
name: '${{ matrix.name }}'
runs-on: ubuntu-latest
env:
DEPLOYMENT_EXAMPLE_DIR: ./examples/poc/dsf_deployment
UPGRADE_EXAMPLE_DIR: ./examples/sonar_upgrade
DEPLOYMENT_EXAMPLE_DIR: ./examples/aws/poc/dsf_deployment
UPGRADE_EXAMPLE_DIR: ./examples/aws/sonar_upgrade
AWS_REGION: eu-west-2
SONAR_TARGET_VERSION: 4.13.0.10.0
TF_VAR_enable_sonar: ${{ matrix.enable_sonar }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar_upgrade_flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- 'dev'
paths:
- 'modules/aws/sonar-upgrader/**'
- 'examples/sonar_upgrade/*'
- 'examples/aws/sonar_upgrade/*'

pull_request:
types:
Expand All @@ -30,7 +30,7 @@ on:
- 'dev'
paths:
- 'modules/aws/sonar-upgrader/**'
- 'examples/sonar_upgrade/*'
- 'examples/aws/sonar_upgrade/*'

permissions:
contents: read
Expand Down
Loading

0 comments on commit 9683288

Please sign in to comment.