Skip to content

Commit

Permalink
[WIP] simplify CI
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandre Lamarre <[email protected]>
  • Loading branch information
alexandreLamarre committed Jan 8, 2025
1 parent 464e4e2 commit 2babdd2
Show file tree
Hide file tree
Showing 9 changed files with 392 additions and 310 deletions.
File renamed without changes.
50 changes: 25 additions & 25 deletions .github/workflows/hl-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
name: "[helm-locker] CI"
# name: "[helm-locker] CI"

on:
workflow_call:
pull_request:
push:
branches:
- main
# on:
# workflow_call:
# pull_request:
# push:
# branches:
# - main

jobs:
build:
strategy:
matrix:
arch:
- x64
- arm64
runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name : Set up Go
uses : actions/setup-go@v5
with:
go-version: 1.22
- name: Run CI
run: BUILD_TARGET=helm-locker make ci
# jobs:
# build:
# strategy:
# matrix:
# arch:
# - x64
# - arm64
# runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name : Set up Go
# uses : actions/setup-go@v5
# with:
# go-version: 1.22
# - name: Run CI
# run: BUILD_TARGET=helm-locker make ci
104 changes: 52 additions & 52 deletions .github/workflows/hl-e2e.yaml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
name: "[helm-locker] CI-e2e"
# name: "[helm-locker] CI-e2e"

on:
pull_request:
push:
branches:
- main
paths:
- 'go.mod'
- 'charts/helm-locker*/**'
- 'crds/helm-locker/**'
- 'package/Dockerfile-helm-locker'
- 'cmd/helm-locker/**'
- 'pkg/helm-locker/**'
# on:
# pull_request:
# push:
# branches:
# - main
# paths:
# - 'go.mod'
# - 'charts/helm-locker*/**'
# - 'crds/helm-locker/**'
# - 'package/Dockerfile-helm-locker'
# - 'cmd/helm-locker/**'
# - 'pkg/helm-locker/**'

env:
CLUSTER_NAME : e2e-ci-helm-locker
K3S_VERSION : v1.27.9-k3s1
# env:
# CLUSTER_NAME : e2e-ci-helm-locker
# K3S_VERSION : v1.27.9-k3s1

jobs:
build:
strategy:
matrix:
arch:
- x64
- arm64
runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name : Set up Go
uses : actions/setup-go@v5
with:
go-version: 1.22
- uses: azure/setup-kubectl@v3
- uses: azure/setup-helm@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: build
run: BUILD_TARGET=helm-locker make build
- name : Install k3d
run : ./.github/workflows/e2e/scripts/install-k3d.sh
- name : Setup k3d cluster
run : K3S_VERSION=${{ env.K3S_VERSION }} ./.github/workflows/e2e/scripts/setup-cluster.sh
# temporary hack to run the helm-locker controller in the k3d cluster
- name : run helm-locker
run : |
kubectl create ns cattle-helm-system
./build/bin/helm-locker &
- name : run e2e tests
run: |
k3d kubeconfig get ${{ env.CLUSTER_NAME }} > kubeconfig.yaml
export KUBECONFIG=$(pwd)/kubeconfig.yaml
cd tests && KUBECONFIG=$KUBECONFIG go test -v -race -timeout 30m ./...
# jobs:
# build:
# strategy:
# matrix:
# arch:
# - x64
# - arm64
# runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name : Set up Go
# uses : actions/setup-go@v5
# with:
# go-version: 1.22
# - uses: azure/setup-kubectl@v3
# - uses: azure/setup-helm@v3
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# - name: build
# run: BUILD_TARGET=helm-locker make build
# - name : Install k3d
# run : ./.github/workflows/e2e/scripts/install-k3d.sh
# - name : Setup k3d cluster
# run : K3S_VERSION=${{ env.K3S_VERSION }} ./.github/workflows/e2e/scripts/setup-cluster.sh
# # temporary hack to run the helm-locker controller in the k3d cluster
# - name : run helm-locker
# run : |
# kubectl create ns cattle-helm-system
# ./build/bin/helm-locker &
# - name : run e2e tests
# run: |
# k3d kubeconfig get ${{ env.CLUSTER_NAME }} > kubeconfig.yaml
# export KUBECONFIG=$(pwd)/kubeconfig.yaml
# cd tests && KUBECONFIG=$KUBECONFIG go test -v -race -timeout 30m ./...
134 changes: 67 additions & 67 deletions .github/workflows/hpo-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
name: "[helm-project-operator] ci"
# name: "[helm-project-operator] ci"

env:
CGO_ENABLED: 0
YQ_VERSION: v4.44.3
# env:
# CGO_ENABLED: 0
# YQ_VERSION: v4.44.3

on:
pull_request:
workflow_call:
inputs:
skip_build:
default: 'false'
required: false
type: string
# on:
# pull_request:
# workflow_call:
# inputs:
# skip_build:
# default: 'false'
# required: false
# type: string

permissions:
contents: read
# permissions:
# contents: read

jobs:
build:
strategy:
matrix:
arch:
- x64
- arm64
runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name : setup Go
uses : actions/setup-go@v5
with:
go-version: 1.22
- name: Install mikefarah/yq
run: |
sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${{ matrix.arch == 'x64' && 'amd64' || matrix.arch }} -O /usr/bin/yq && sudo chmod +x /usr/bin/yq;
- uses: azure/setup-helm@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Perform CI
run : BUILD_TARGET=helm-project-operator make ci
build-images:
if: ${{ inputs.skip_build != 'true' }}
strategy:
matrix:
arch:
- x64
- arm64
runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name : Set up Go
uses : actions/setup-go@v5
with:
go-version: 1.22
- name : Export image version
run : |
source ./scripts/version
echo IMAGE=$IMAGE >> $GITHUB_ENV
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build Helm Project Operator image
uses: docker/build-push-action@v5
with:
context: .
file: ./package/Dockerfile-helm-project-operator
push: false
tags: ${{ env.IMAGE }}
# jobs:
# build:
# strategy:
# matrix:
# arch:
# - x64
# - arm64
# runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name : setup Go
# uses : actions/setup-go@v5
# with:
# go-version: 1.22
# - name: Install mikefarah/yq
# run: |
# sudo wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${{ matrix.arch == 'x64' && 'amd64' || matrix.arch }} -O /usr/bin/yq && sudo chmod +x /usr/bin/yq;
# - uses: azure/setup-helm@v3
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# - name: Perform CI
# run : BUILD_TARGET=helm-project-operator make ci
# build-images:
# if: ${{ inputs.skip_build != 'true' }}
# strategy:
# matrix:
# arch:
# - x64
# - arm64
# runs-on : runs-on,image=ubuntu22-full-${{ matrix.arch }},runner=4cpu-linux-${{ matrix.arch }},run-id=${{ github.run_id }}
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name : Set up Go
# uses : actions/setup-go@v5
# with:
# go-version: 1.22
# - name : Export image version
# run : |
# source ./scripts/version
# echo IMAGE=$IMAGE >> $GITHUB_ENV
# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v3
# - name: Build Helm Project Operator image
# uses: docker/build-push-action@v5
# with:
# context: .
# file: ./package/Dockerfile-helm-project-operator
# push: false
# tags: ${{ env.IMAGE }}
Loading

0 comments on commit 2babdd2

Please sign in to comment.