Skip to content

Commit 48fb0a0

Browse files
alvarocabanasalvarocabanas
committed
TEST
1 parent 123d9b1 commit 48fb0a0

File tree

3 files changed

+83
-79
lines changed

3 files changed

+83
-79
lines changed

‎.github/workflows/component_linux_publish.yml

+2
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,5 @@ jobs:
109109
gpg_passphrase: ${{ env.GPG_PASSPHRASE }}
110110
gpg_private_key_base64: ${{ env.GPG_PRIVATE_KEY_BASE64 }}
111111
disable_lock: ${{ env.DISABLE_LOCK }}
112+
# TODO: remove after testing
113+
dest_prefix: acabanas_molecule_test_fips/

‎.github/workflows/component_molecule_packaging.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
name: Test package installation
2222
runs-on: ubuntu-latest
2323
steps:
24-
- name: Test NON-FIPS package installation
25-
uses: newrelic/pkg-installation-testing-action@v1
26-
with:
27-
gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg'
28-
repo_base_url: ${{ inputs.REPO_ENDPOINT }}
29-
package_name: 'newrelic-infra'
30-
package_version: ${{ inputs.TAG }}
31-
platforms: "al2,al2023,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.3,suse15.4,suse15.5,suse15.6,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404"
24+
# - name: Test NON-FIPS package installation
25+
# uses: newrelic/pkg-installation-testing-action@v1
26+
# with:
27+
# gpg_key: 'https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg'
28+
# repo_base_url: ${{ inputs.REPO_ENDPOINT }}
29+
# package_name: 'newrelic-infra'
30+
# package_version: ${{ inputs.TAG }}
31+
# platforms: "al2,al2023,debian-bullseye,debian-bookworm,redhat8,redhat9,suse15.3,suse15.4,suse15.5,suse15.6,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204,ubuntu2404"
3232
- name: Test FIPS package installation
3333
uses: newrelic/pkg-installation-testing-action@v1
3434
with:

‎.github/workflows/prerelease_linux.yml

+73-71
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
2020

2121
packaging-amd64:
22-
needs: [unit-test, proxy-tests]
22+
# needs: [unit-test, proxy-tests]
2323
uses: ./.github/workflows/component_linux_packaging.yml
2424
secrets:
2525
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
@@ -33,7 +33,7 @@ jobs:
3333
ARCH: 'amd64'
3434

3535
packaging-amd64-fips:
36-
needs: [unit-test, proxy-tests]
36+
# needs: [unit-test, proxy-tests]
3737
uses: ./.github/workflows/component_linux_packaging.yml
3838
secrets:
3939
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
@@ -48,7 +48,7 @@ jobs:
4848
FIPS: true
4949

5050
packaging-arm:
51-
needs: [unit-test, proxy-tests]
51+
# needs: [unit-test, proxy-tests]
5252
uses: ./.github/workflows/component_linux_packaging.yml
5353
secrets:
5454
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
@@ -62,7 +62,7 @@ jobs:
6262
ARCH: 'arm'
6363

6464
packaging-arm64:
65-
needs: [unit-test, proxy-tests]
65+
# needs: [unit-test, proxy-tests]
6666
uses: ./.github/workflows/component_linux_packaging.yml
6767
secrets:
6868
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
@@ -76,7 +76,7 @@ jobs:
7676
ARCH: 'arm64'
7777

7878
packaging-arm64-fips:
79-
needs: [unit-test, proxy-tests]
79+
# needs: [unit-test, proxy-tests]
8080
uses: ./.github/workflows/component_linux_packaging.yml
8181
secrets:
8282
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
@@ -91,7 +91,7 @@ jobs:
9191
FIPS: true
9292

9393
packaging-legacy:
94-
needs: [unit-test, proxy-tests]
94+
# needs: [unit-test, proxy-tests]
9595
uses: ./.github/workflows/component_linux_packaging.yml
9696
secrets:
9797
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
@@ -104,25 +104,25 @@ jobs:
104104
TAG: ${{ github.event.release.tag_name }}
105105
ARCH: 'legacy'
106106

107-
packaging-docker:
108-
needs: [unit-test, proxy-tests]
109-
uses: ./.github/workflows/component_docker_packaging.yml
110-
secrets:
111-
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
112-
DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
113-
GPG_MAIL: '[email protected]'
114-
GPG_PASSPHRASE: ${{ secrets.OHAI_GPG_PASSPHRASE }}
115-
GPG_PRIVATE_KEY_BASE64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded
116-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117-
with:
118-
TAG: ${{ github.event.release.tag_name }}
119-
120-
docker-trivy-critical:
121-
needs: [packaging-docker]
122-
uses: ./.github/workflows/component_trivy.yml
123-
with:
124-
tag: "${{ github.event.release.tag_name }}-rc"
125-
severity: "CRITICAL"
107+
# packaging-docker:
108+
# needs: [unit-test, proxy-tests]
109+
# uses: ./.github/workflows/component_docker_packaging.yml
110+
# secrets:
111+
# DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
112+
# DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
113+
# GPG_MAIL: '[email protected]'
114+
# GPG_PASSPHRASE: ${{ secrets.OHAI_GPG_PASSPHRASE }}
115+
# GPG_PRIVATE_KEY_BASE64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded
116+
# GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117+
# with:
118+
# TAG: ${{ github.event.release.tag_name }}
119+
#
120+
# docker-trivy-critical:
121+
# needs: [packaging-docker]
122+
# uses: ./.github/workflows/component_trivy.yml
123+
# with:
124+
# tag: "${{ github.event.release.tag_name }}-rc"
125+
# severity: "CRITICAL"
126126

127127
publishing-to-s3:
128128
# point to staging after tests
@@ -140,7 +140,9 @@ jobs:
140140
AWS_ROLE_SESSION_NAME: ${{ secrets.OHAI_AWS_ROLE_SESSION_NAME_STAGING }}
141141
with:
142142
ACCESS_POINT_HOST: "staging"
143-
SCHEMA_BRANCH: "master"
143+
# TODO: modify to master after testing
144+
# SCHEMA_BRANCH: "master"
145+
SCHEMA_BRANCH: "NR_351326_linux_prerelease_fips"
144146
RUN_ID: ${{ github.run_id }}
145147
TAG: ${{ github.event.release.tag_name }}
146148
AWS_S3_BUCKET_NAME: "nr-downloads-ohai-staging"
@@ -152,49 +154,49 @@ jobs:
152154
needs: [publishing-to-s3]
153155
with:
154156
TAG: ${{ github.event.release.tag_name }}
155-
REPO_ENDPOINT: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
156-
157-
test-prerelease-linux:
158-
needs: [molecule-packaging-tests]
159-
uses: ./.github/workflows/component_prerelease_testing.yml
160-
with:
161-
PLATFORM: "linux"
162-
TAG: ${{ github.event.release.tag_name }}
163-
TAG_OR_UNIQUE_NAME: "${{ github.event.release.tag_name }}-linux"
164-
secrets:
165-
AWS_VPC_SUBNET: ${{secrets.AWS_VPC_SUBNET}}
166-
CROWDSTRIKE_CLIENT_ID: ${{secrets.CROWDSTRIKE_CLIENT_ID}}
167-
CROWDSTRIKE_CLIENT_SECRET: ${{secrets.CROWDSTRIKE_CLIENT_SECRET}}
168-
CROWDSTRIKE_CUSTOMER_ID: ${{secrets.CROWDSTRIKE_CUSTOMER_ID}}
169-
170-
canaries-linux:
171-
needs: [test-prerelease-linux]
172-
uses: ./.github/workflows/component_canaries.yml
173-
with:
174-
PLATFORM: "linux"
175-
TAG: ${{ github.event.release.tag_name }}
176-
secrets:
177-
AWS_VPC_SUBNET: ${{secrets.AWS_VPC_SUBNET}}
178-
CROWDSTRIKE_CLIENT_ID: ${{secrets.CROWDSTRIKE_CLIENT_ID}}
179-
CROWDSTRIKE_CLIENT_SECRET: ${{secrets.CROWDSTRIKE_CLIENT_SECRET}}
180-
CROWDSTRIKE_CUSTOMER_ID: ${{secrets.CROWDSTRIKE_CUSTOMER_ID}}
181-
182-
get_previous_tag:
183-
runs-on: ubuntu-latest
184-
outputs:
185-
previous_tag: ${{ steps.previous_tag_step.outputs.PREVIOUS_TAG }}
186-
steps:
187-
- uses: actions/checkout@v2
188-
189-
- id: previous_tag_step
190-
run: ./.github/workflows/scripts/previous_version.sh ${{ github.event.release.tag_name }} >> "$GITHUB_OUTPUT"
191-
192-
prune-previous-canaries-linux:
193-
needs: [canaries-linux, get_previous_tag]
194-
uses: ./.github/workflows/component_canaries_prune.yml
195-
with:
196-
PLATFORM: "linux"
197-
TAG: ${{ needs.get_previous_tag.outputs.previous_tag }}
198-
secrets:
199-
AWS_VPC_SUBNET: ${{secrets.AWS_VPC_SUBNET}}
157+
REPO_ENDPOINT: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/acabanas_molecule_test_fips"
158+
159+
# test-prerelease-linux:
160+
# needs: [molecule-packaging-tests]
161+
# uses: ./.github/workflows/component_prerelease_testing.yml
162+
# with:
163+
# PLATFORM: "linux"
164+
# TAG: ${{ github.event.release.tag_name }}
165+
# TAG_OR_UNIQUE_NAME: "${{ github.event.release.tag_name }}-linux"
166+
# secrets:
167+
# AWS_VPC_SUBNET: ${{secrets.AWS_VPC_SUBNET}}
168+
# CROWDSTRIKE_CLIENT_ID: ${{secrets.CROWDSTRIKE_CLIENT_ID}}
169+
# CROWDSTRIKE_CLIENT_SECRET: ${{secrets.CROWDSTRIKE_CLIENT_SECRET}}
170+
# CROWDSTRIKE_CUSTOMER_ID: ${{secrets.CROWDSTRIKE_CUSTOMER_ID}}
171+
#
172+
# canaries-linux:
173+
# needs: [test-prerelease-linux]
174+
# uses: ./.github/workflows/component_canaries.yml
175+
# with:
176+
# PLATFORM: "linux"
177+
# TAG: ${{ github.event.release.tag_name }}
178+
# secrets:
179+
# AWS_VPC_SUBNET: ${{secrets.AWS_VPC_SUBNET}}
180+
# CROWDSTRIKE_CLIENT_ID: ${{secrets.CROWDSTRIKE_CLIENT_ID}}
181+
# CROWDSTRIKE_CLIENT_SECRET: ${{secrets.CROWDSTRIKE_CLIENT_SECRET}}
182+
# CROWDSTRIKE_CUSTOMER_ID: ${{secrets.CROWDSTRIKE_CUSTOMER_ID}}
183+
#
184+
# get_previous_tag:
185+
# runs-on: ubuntu-latest
186+
# outputs:
187+
# previous_tag: ${{ steps.previous_tag_step.outputs.PREVIOUS_TAG }}
188+
# steps:
189+
# - uses: actions/checkout@v2
190+
#
191+
# - id: previous_tag_step
192+
# run: ./.github/workflows/scripts/previous_version.sh ${{ github.event.release.tag_name }} >> "$GITHUB_OUTPUT"
193+
#
194+
# prune-previous-canaries-linux:
195+
# needs: [canaries-linux, get_previous_tag]
196+
# uses: ./.github/workflows/component_canaries_prune.yml
197+
# with:
198+
# PLATFORM: "linux"
199+
# TAG: ${{ needs.get_previous_tag.outputs.previous_tag }}
200+
# secrets:
201+
# AWS_VPC_SUBNET: ${{secrets.AWS_VPC_SUBNET}}
200202

0 commit comments

Comments
 (0)