Skip to content

Commit

Permalink
debug ci x
Browse files Browse the repository at this point in the history
Signed-off-by: tao.yang <[email protected]>
  • Loading branch information
ty-dc committed Jun 21, 2024
1 parent 7333c3b commit c86557b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/auto-upgrade-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ jobs:
call_build_old_ci_image:
needs: [get_ref]
if: ${{ needs.get_ref.outputs.run_upgrade_enabled == 'true' }}
# get image:${{ needs.get_ref.outputs.ref }} and image-ci:${{ needs.get_ref.outputs.ref }}
uses: ./.github/workflows/build-image-ci.yaml
with:
ref: ${{ needs.get_ref.outputs.old_version }}
Expand Down Expand Up @@ -197,8 +198,9 @@ jobs:
docker-images: true
swap-storage: true

- name: Checkout code
uses: actions/checkout@v4
- name: Download old spiderpool-agent image
if: ${{ needs.get_ref.outputs.build_old_image_tag == 'true' }}
uses: actions/download-artifact@v3
with:
persist-credentials: false
ref: ${{ needs.get_ref.outputs.old_version }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile.defs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CONTAINER_ENGINE?=docker

#----------build-image--------
SPIDERPOOL_REGISTER ?= ghcr.io
GIT_REPO ?= spidernet-io/spiderpool
GIT_REPO ?= ty-dc/spiderpool
SPIDERPOOL_AGENT_IMAGE_NAME := ${SPIDERPOOL_REGISTER}/${GIT_REPO}/spiderpool-agent
SPIDERPOOL_CONTROLLER_IMAGE_NAME := ${SPIDERPOOL_REGISTER}/${GIT_REPO}/spiderpool-controller
SPIDERPOOL_IMAGES := $(SPIDERPOOL_AGENT_IMAGE_NAME) ${SPIDERPOOL_CONTROLLER_IMAGE_NAME}
Expand Down
1 change: 0 additions & 1 deletion test/e2e/spidermultus/spidermultus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ var _ = Describe("test spidermultus", Label("SpiderMultusConfig", "overlay"), fu
GinkgoWriter.Println("If the use case fails, the cleanup step will be skipped")
return
}

err := frame.DeleteNamespace(namespace)
Expect(err).NotTo(HaveOccurred(), "Failed to delete namespace %v")
})
Expand Down

0 comments on commit c86557b

Please sign in to comment.