Skip to content

Commit

Permalink
minor change
Browse files Browse the repository at this point in the history
  • Loading branch information
aramovic79 committed Aug 23, 2024
1 parent b4c42b6 commit e8bccd1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/github-actions-apeiora-ows3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v4
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
# - name: Run tests using make
# run: make tmptest
- name: Run tests using make
run: make tmptest
- name: Check and install make
run: |
if ! command -v make &> /dev/null
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ push: .push
@if [ -z "$(NEW_VERSION)" ]; then \
NEW_VERSION=latest; \
fi
@curl -X DELETE -u "$(ARTIFACTORY_USER):$(ARTIFACTORY_TOKEN)" "$(JF_URL)/v2/$(IMAGE)/manifests/latest"
@curl -X DELETE -u "$(ARTIFACTORY_USER):$(ARTIFACTORY_TOKEN)" "https://apeirora-ows3.common.repositories.cloud.sap/v2/xreg-server/manifests/latest"
# @curl -X DELETE -u "$(ARTIFACTORY_USER):$(ARTIFACTORY_TOKEN)" "$(JF_URL)/v2/$(IMAGE)/manifests/latest"
@docker tag $(IMAGE) $(JF_URL)/$(IMAGE):latest
@docker push $(JF_URL)/$(IMAGE):latest
@echo "Latest docker image pushed"
Expand Down Expand Up @@ -176,7 +177,7 @@ k8: $(GARDEN_OWS3_PATH) $(K8_CLUSTER_PATH)
@$(MAKE) push
@gardenctl config set-garden sap-landscape-canary --kubeconfig "$(GARDEN_OWS3_PATH)"
# TODO: Solve this blocker "Please visit the following URL in your browser manually: http://localhost:8000"
@kubectl --kubeconfig "$(K8_CLUSTER_PATH)" get namespaces
# @kubectl --kubeconfig "$(K8_CLUSTER_PATH)" get namespaces
@export KUBECONFIG=$(K8_CLUSTER_PATH)
# @kubectl create secret docker-registry apeirora-ows3-secret \
# --docker-username=$(ARTIFACTORY_USER) \
Expand Down
6 changes: 3 additions & 3 deletions cmds/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -661,22 +661,22 @@ func LoadOrdSample(reg *registry.Registry) *registry.Registry {
var err error
log.VPrintf(1, "Loading registry '%s'", "sap.foo registry")
if reg == nil {
reg, err = registry.FindRegistry(nil, "SapFooLatestRegistry")
reg, err = registry.FindRegistry(nil, "SapFooRegistry")
ErrFatalf(err)

if reg != nil {
reg.Rollback()
return reg
}

reg, err = registry.NewRegistry(nil, "SapFooLatestRegistry")
reg, err = registry.NewRegistry(nil, "SapFooRegistry")
ErrFatalf(err, "Error creating new registry: %s", err)

defer reg.Rollback()

// registry root attributes + ORD mandatory attributes; have to be lower case.
ErrFatalf(reg.SetSave("specversion", "0.5"))
ErrFatalf(reg.SetSave("id", "SapFooLatestRegistry"))
ErrFatalf(reg.SetSave("id", "SapFooRegistry"))
ErrFatalf(reg.SetSave("description", "Example based on ORD Reference App"))
}

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.0
1.7.0

0 comments on commit e8bccd1

Please sign in to comment.