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

chore: cleanup ci #28

Merged
merged 7 commits into from
Feb 2, 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
9 changes: 0 additions & 9 deletions .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ inputs:
install-k3d:
description: "whether to install k3d or not"
default: "true"
install-node:
description: "whether to install node or not"
default: "true"

runs:
using: "composite"
Expand All @@ -23,12 +20,6 @@ runs:
version: v0.32.1
download-init-package: ${{ inputs.download-init-package }}

- name: Use Node.js latest
if: ${{ inputs.install-node == 'true' }}
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
with:
node-version: 20

- name: Install k3d
if: ${{ inputs.install-k3d == 'true' }}
shell: bash
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ jobs:
run: npm install --save-dev @commitlint/{config-conventional,cli}

- name: Lint PR title
run: echo "${{ github.event.pull_request.title }}" | npx commitlint
env:
pull_request_title: ${{ github.event.pull_request.title }}
run: echo "$pull_request_title" | npx commitlint
30 changes: 0 additions & 30 deletions .github/workflows/pull-request-conditionals.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
name: Test package
name: Test

# This workflow is triggered on pull requests to the main branch.
on:
# Manual trigger
workflow_dispatch:

# Triggered by pull-request-conditionals.yaml
workflow_call:

# Abort prior jobs in the same workflow / PR
concurrency:
group: test-${{ github.ref }}-${{ inputs.package }}
cancel-in-progress: true
pull_request:
paths:
- ".github/**"
- "bundle/**"
- "values/**"
- "tasks/**"
- "src/**"
- "chart/**"
- "tasks.yaml"
- "zarf.yaml"

# Permissions for the GITHUB_TOKEN used by the workflow.
permissions:
contents: read
id-token: write # Needed for OIDC-related operations.
contents: read # Allows reading the content of the repository.
pull-requests: read # Allows reading pull request metadata.

# Default settings for all run commands in the workflow jobs.
defaults:
run:
shell: bash -e -o pipefail {0} # Ensures that scripts fail on error and pipefail is set.

jobs:
test:
deploy:
runs-on: "ubuntu-latest"
timeout-minutes: 20
name: Test
strategy:
matrix:
flavor: [upstream-ce, registry1]
name: Deploy ${{ matrix.flavor }}

steps:
- name: Checkout repository
Expand All @@ -32,6 +41,7 @@ jobs:
uses: ./.github/actions/setup

- name: Iron Bank Login
if: ${{ matrix.flavor == 'registry1' }}
run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil

- name: Create test bundle
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/tag-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
needs: tag-new-version
if: ${{ needs.tag-new-version.outputs.release_created == 'true' }}
runs-on: ubuntu-latest
name: Publish package
strategy:
matrix:
flavor: [upstream-ce, registry1]
name: Publish ${{ matrix.flavor }}

permissions:
contents: read
Expand All @@ -40,7 +40,6 @@ jobs:
with:
download-init-package: false
install-k3d: false
install-node: false

- name: Iron Bank Login
run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil
Expand Down
2 changes: 1 addition & 1 deletion tasks/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ tasks:
- name: k3d-test-cluster
actions:
- description: Create k3d cluster with UDS Core
cmd: uds deploy oci://defenseunicorns/uds/bundles/k3d-core-istio:0.8.0-${UDS_ARCH} --confirm --no-progress
cmd: uds deploy oci://defenseunicorns/uds/bundles/k3d-core-istio-dev:0.9.2-${UDS_ARCH} --confirm --no-progress
16 changes: 8 additions & 8 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ components:
only:
flavor: registry1
charts:
- name: uds-sonarqube-config
namespace: sonarqube
version: 0.1.0
localPath: chart
- name: sonarqube
namespace: sonarqube
url: https://repo1.dso.mil/big-bang/product/packages/sonarqube.git
gitPath: chart
version: "8.0.3-bb.0"
valuesFiles:
- values/sonarqube-values.yaml
- name: uds-sonarqube-config
namespace: sonarqube
version: 0.1.0
localPath: chart
images:
- "registry1.dso.mil/ironbank/big-bang/base:2.1.0"
- "registry1.dso.mil/ironbank/big-bang/sonarqube-9:9.9.3-community"
Expand All @@ -69,6 +69,10 @@ components:
only:
flavor: upstream-ce
charts:
- name: uds-sonarqube-config
namespace: sonarqube
version: 0.1.0
localPath: chart
- name: sonarqube
#helm repo add sonarqube https://SonarSource.github.io/helm-chart-sonarqube
#helm search repo sonarqube/sonarqube -l
Expand All @@ -80,10 +84,6 @@ components:
valuesFiles:
- values/sonarqube-values.yaml
- values/upstream.yaml
- name: uds-sonarqube-config
namespace: sonarqube
version: 0.1.0
localPath: chart
images:
- "sonarqube:9.9.3-community"
- "curlimages/curl:7.76.1"
Expand Down
Loading