Skip to content

Commit

Permalink
GitHub actions: use DockerHub secret to login for Eden Actions
Browse files Browse the repository at this point in the history
Signed-off-by: Pavel Abramov <uncle.decart@gmail.com>
  • Loading branch information
uncleDecart committed Jul 1, 2024
1 parent b6505d4 commit b763bfe
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/eden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
uses: ./.github/workflows/test.yml
with:
eve_image: "lfedge/eve:12.4.0"

secrets: inherit
46 changes: 15 additions & 31 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ on: # yamllint disable-line rule:truthy
type: string
artifact_run_id:
type: string
docker_account: # if not provided: use anonymous docker user
type: string
required: false
default: ''
docker_token:
type: string
required: false
default: ''
workflow_call:
inputs:
eden_version:
Expand All @@ -34,14 +26,6 @@ on: # yamllint disable-line rule:truthy
type: string
artifact_run_id:
type: string
docker_account: # if not provided: use anonymous docker user
type: string
required: false
default: ''
docker_token:
type: string
required: false
default: ''

jobs:
determine-runner:
Expand Down Expand Up @@ -86,9 +70,9 @@ jobs:
suite: "smoke.tests.txt"
eve_image: ${{ inputs.eve_image }}
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
artifact_run_id: ${{ secrets.artifact_run_id }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}

networking:
name: Networking test suite
Expand All @@ -110,8 +94,8 @@ jobs:
eve_image: ${{ inputs.eve_image }}
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}

storage:
continue-on-error: true
Expand All @@ -137,8 +121,8 @@ jobs:
eve_image: ${{ inputs.eve_image }}
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}

lps-loc:
name: LPS LOC test suite
Expand All @@ -160,8 +144,8 @@ jobs:
eve_image: ${{ inputs.eve_image }}
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}

eve-upgrade:
continue-on-error: true
Expand All @@ -187,8 +171,8 @@ jobs:
eve_image: ${{ inputs.eve_image }}
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}

user-apps:
name: User apps test suite
Expand All @@ -210,8 +194,8 @@ jobs:
eve_image: ${{ inputs.eve_image }}
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}

virtualization:
name: Virtualization test suite
Expand All @@ -234,5 +218,5 @@ jobs:
eve_artifact_name: ${{ inputs.eve_artifact_name }}
artifact_run_id: ${{ inputs.artifact_run_id }}
require_virtualization: true
docker_account: ${{ inputs.docker_account }}
docker_token: ${{ inputs.docker_token }}
docker_account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
docker_token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
1 change: 1 addition & 0 deletions .yetus/detsecrets-ignored-hashes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e26d6750975d678acb8fa35a0f69237881576b0

0 comments on commit b763bfe

Please sign in to comment.