Skip to content

Commit af38712

Browse files
authored
Merge pull request #41 from e0ne/image-name-25.1
fix: Use correct Docker image names
2 parents 475fdbf + d4836d0 commit af38712

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/fork-ci.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ jobs:
4747
matrix:
4848
include:
4949
- component: operator
50-
image_name: mellanox
50+
image_name: sriov-network-operator
5151
dockerfile: Dockerfile
5252
- component: config-daemon
53-
image_name: mellanox-config-daemon
53+
image_name: sriov-network-operator-config-daemon
5454
dockerfile: Dockerfile.sriov-network-config-daemon
5555
- component: webhook
56-
image_name: mellanox-webhook
56+
image_name: sriov-network-operator-webhook
5757
dockerfile: Dockerfile.webhook
5858
steps:
5959
- uses: actions/checkout@v4
@@ -82,28 +82,34 @@ jobs:
8282
DOCKER_TAG: ${{ needs.determine_docker_registry_and_tag.outputs.docker_tag }}
8383
GH_TOKEN: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}
8484
steps:
85+
- uses: actions/checkout@v4
86+
with:
87+
path: sriov-network-operator-fork
8588
- uses: actions/checkout@v4
8689
with:
8790
token: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}
8891
repository: ${{ github.repository_owner }}/network-operator
92+
path: network-opertor-fork
8993
- name: Determine base branch
9094
run: |
9195
echo "BASE_BRANCH=${{ contains(env.DOCKER_TAG, 'beta') && 'master' || env.DOCKER_TAG }}" >> $GITHUB_ENV
9296
- name: Create PR to update image tags in network-operator values
9397
run: |
94-
98+
cd network-opertor-fork
99+
95100
git config user.name nvidia-ci-cd
96101
git config user.email svc-cloud-orch-gh@nvidia.com
97-
102+
98103
git checkout -b feature/update-sriov-tags-to-$DOCKER_TAG
99-
100-
cp -r ../sriov-network-operator/deployment/sriov-network-operator-chart/* deployment/network-operator/charts/sriov-network-operator/
101-
104+
105+
cp -r ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/* deployment/network-operator/charts/sriov-network-operator/
106+
102107
yq -i e '.SriovNetworkOperator.repository |= "${{ env.DOCKER_REGISTRY }}"' hack/release.yaml
103108
yq -i e '.SriovNetworkOperator.version |= "${{ env.DOCKER_TAG }}"' hack/release.yaml
104109
make release-build
105110
106111
if ! git diff --color --unified=0 --exit-code; then
112+
git add deployment/network-operator/charts/sriov-network-operator
107113
git commit -sam "task: update SR-IOV images tags to $DOCKER_TAG in chart values"
108114
git push -u origin feature/update-sriov-tags-to-$DOCKER_TAG
109115
gh pr create \

0 commit comments

Comments
 (0)