Skip to content

Commit c03c5c3

Browse files
kasiakoziolkasiakoziol
committed
Merge branch 'CSPL-3768-graviton-pipelines-enhancements' into feature/CSPL-3768-graviton-pipelines-enhancements-copy-tests
2 parents c28ff81 + f6ff895 commit c03c5c3

6 files changed

+19
-23
lines changed

‎.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
splunk_image_repository_tag:
6-
description: 'Splunk AL2023-based Docker Image repository and image tag (e.g. repository-name:tag)'
6+
description: 'Splunk AL2023-based Docker Image repository and tag (e.g. repository-name:tag)'
77
required: true
88
jobs:
99
check-formating:
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
needs: unit-tests
5656
env:
57-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
57+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
5858
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
5959
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
6060
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
@@ -122,8 +122,8 @@ jobs:
122122
env:
123123
CLUSTER_NODES: 1
124124
CLUSTER_WORKERS: 3
125-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
126-
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
125+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
126+
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
127127
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
128128
SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
129129
TEST_FOCUS: "${{ matrix.test }}"

‎.github/workflows/arm-AL2023-int-test-workflow.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ on:
33
workflow_dispatch:
44
inputs:
55
splunk_image_repository_tag:
6-
description: 'Splunk AL2023-based Docker Image repository and image tag (e.g. repository-name:tag)'
6+
description: 'Splunk AL2023-based Docker Image repository and tag (e.g. repository-name:tag)'
77
required: true
88
jobs:
99
build-operator-image-arm-al2023:
1010
runs-on: ubuntu-latest
1111
timeout-minutes: 360
1212
env:
13-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
13+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1414
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
1515
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
1616
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
@@ -71,8 +71,8 @@ jobs:
7171
env:
7272
CLUSTER_NODES: 1
7373
CLUSTER_WORKERS: 3
74-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
75-
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
74+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
75+
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
7676
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
7777
SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
7878
TEST_FOCUS: "${{ matrix.test }}"

‎.github/workflows/arm-RHEL-build-test-push-workflow.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ on:
33
workflow_dispatch:
44
inputs:
55
splunk_image_repository_tag:
6-
description: 'Splunk RHEL-based Docker Image repository and image tag (e.g. repository-name:tag)'
6+
description: 'Splunk RHEL-based Docker Image repository and tag (e.g. repository-name:tag)'
77
required: true
88
jobs:
99
build-operator-image-arm-rhel:
1010
runs-on: ubuntu-latest
1111
timeout-minutes: 360
1212
env:
13-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
13+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1414
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
1515
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
1616
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
export PLATFORMS=linux/arm64,linux/amd64
4848
export BASE_IMAGE=redhat/ubi9-minimal
49-
export BASE_IMAGE_VERSION=9.5-1747111267
49+
export BASE_IMAGE_VERSION=9.5
5050
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5151
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
5252
int-tests-arm-rhel:
@@ -56,8 +56,6 @@ jobs:
5656
test:
5757
[
5858
appframeworksS1,
59-
managerappframeworkc3,
60-
managerappframeworkm4,
6159
managersecret,
6260
managersmartstore,
6361
managermc1,
@@ -71,8 +69,8 @@ jobs:
7169
env:
7270
CLUSTER_NODES: 1
7371
CLUSTER_WORKERS: 3
74-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
75-
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
72+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
73+
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
7674
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
7775
SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
7876
TEST_FOCUS: "${{ matrix.test }}"

‎.github/workflows/arm-RHEL-int-test-workflow.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ on:
33
workflow_dispatch:
44
inputs:
55
splunk_image_repository_tag:
6-
description: 'Splunk RHEL-based Docker Image repository and image tag (e.g. repository-name:tag)'
6+
description: 'Splunk RHEL-based Docker Image repository and tag (e.g. repository-name:tag)'
77
required: true
88
jobs:
99
build-operator-image-arm-rhel:
1010
runs-on: ubuntu-latest
1111
timeout-minutes: 360
1212
env:
13-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
13+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
1414
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
1515
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
1616
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
@@ -56,8 +56,6 @@ jobs:
5656
test:
5757
[
5858
appframeworksS1,
59-
managerappframeworkc3,
60-
managerappframeworkm4,
6159
managersecret,
6260
managersmartstore,
6361
managermc1,
@@ -71,8 +69,8 @@ jobs:
7169
env:
7270
CLUSTER_NODES: 1
7371
CLUSTER_WORKERS: 3
74-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
75-
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ github.event.inputs.splunk_image_repository_tag }}
72+
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
73+
SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }}
7674
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
7775
SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
7876
TEST_FOCUS: "${{ matrix.test }}"

‎.github/workflows/arm-Ubuntu-build-test-push-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
splunk_image_repository_tag:
6-
description: 'Splunk Ubuntu-based Docker Image repository and image tag (e.g. repository-name:tag)'
6+
description: 'Splunk Ubuntu-based Docker Image repository and tag (e.g. repository-name:tag)'
77
required: true
88
jobs:
99
check-formating:

‎.github/workflows/arm-Ubuntu-int-test-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
splunk_image_repository_tag:
6-
description: 'Splunk Ubuntu-based Docker Image repository and image tag (e.g. repository-name:tag)'
6+
description: 'Splunk Ubuntu-based Docker Image repository and tag (e.g. repository-name:tag)'
77
required: true
88
jobs:
99
build-operator-image-arm-ubuntu:

0 commit comments

Comments
 (0)