Skip to content

Commit

Permalink
chore: cleanup cicd scripts (kyma-project#1208)
Browse files Browse the repository at this point in the history
* chore: cleanup cicd scripts

* Move scripts to hack/ci

* Adjust paths

* Adjust paths

* Adjust paths

* Adjust paths and remove unused scripts
  • Loading branch information
kolodziejczak authored Aug 9, 2024
1 parent 764b9de commit 6a5a004
Show file tree
Hide file tree
Showing 19 changed files with 9 additions and 373 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
with:
manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.wait-for-image-build.outputs.sha }}"
gardener_secret: ${{ secrets.GARDENER_TOKEN }}
script: ./tests/integration/scripts/custom-domain-gardener-gcp-gh.sh
script: ./hack/ci/custom-domain-gardener-gcp.sh
client_id: ${{ secrets.CLIENT_ID }}
client_secret: ${{ secrets.CLIENT_SECRET }}
oidc_well_known_url: "${{ secrets.OIDC_ISSUER_URL }}/.well-known/openid-configuration"
Expand All @@ -103,7 +103,7 @@ jobs:
with:
manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.wait-for-image-build.outputs.sha }}"
gardener_secret: ${{ secrets.GARDENER_TOKEN }}
script: ./tests/integration/scripts/custom-domain-gardener-aws-gh.sh
script: ./hack/ci/custom-domain-gardener-aws.sh
client_id: ${{ secrets.CLIENT_ID }}
client_secret: ${{ secrets.CLIENT_SECRET }}
oidc_well_known_url: "${{ secrets.OIDC_ISSUER_URL }}/.well-known/openid-configuration"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-integration-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
with:
manager_image: "europe-docker.pkg.dev/kyma-project/dev/api-gateway-manager:PR-${{github.event.number}}"
gardener_secret: ${{ secrets.GARDENER_TOKEN }}
script: ./tests/integration/scripts/custom-domain-gardener-gcp-gh.sh
script: ./hack/ci/custom-domain-gardener-gcp.sh
client_id: ${{ secrets.CLIENT_ID }}
client_secret: ${{ secrets.CLIENT_SECRET }}
oidc_well_known_url: "${{ secrets.OIDC_ISSUER_URL }}/.well-known/openid-configuration"
Expand All @@ -116,7 +116,7 @@ jobs:
with:
manager_image: "europe-docker.pkg.dev/kyma-project/dev/api-gateway-manager:PR-${{github.event.number}}"
gardener_secret: ${{ secrets.GARDENER_TOKEN }}
script: ./tests/integration/scripts/custom-domain-gardener-aws-gh.sh
script: ./hack/ci/custom-domain-gardener-aws.sh
client_id: ${{ secrets.CLIENT_ID }}
client_secret: ${{ secrets.CLIENT_SECRET }}
oidc_well_known_url: "${{ secrets.OIDC_ISSUER_URL }}/.well-known/openid-configuration"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-unit-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ jobs:
PULL_PULL_SHA=${{ github.event.pull_request.head.sha}} \
PULL_BASE_SHA=${{ github.event.pull_request.base.sha}} \
PULL_NUMBER=${{ github.event.number }} \
./tests/integration/scripts/code-coverage-guard.sh
./hack/ci/code-coverage-guard.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [ -z "$PULL_BASE_SHA" ]; then
fi

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" || exit; pwd)"
cd "${SCRIPT_DIR}/../../../" || exit 1
cd "${SCRIPT_DIR}/../../" || exit 1

echo -e "Code Coverage Guard - Ensures PRs do not lower code coverage\\n"
echo -e "Running tests on: PR-${PULL_NUMBER} (${PULL_PULL_SHA})\\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export GARDENER_PROVIDER_SECRET_NAME="aws-gardener-access"
export GARDENER_PROJECT_NAME="goats"
export GARDENER_CLUSTER_VERSION="1.27.8"

./tests/integration/scripts/custom-domain-gardener-gh.sh
./hack/ci/custom-domain-gardener.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export GARDENER_PROVIDER_SECRET_NAME="goat"
export GARDENER_PROJECT_NAME="goats"
export GARDENER_CLUSTER_VERSION="1.27.8"

./tests/integration/scripts/custom-domain-gardener-gh.sh
./hack/ci/custom-domain-gardener.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export PATH="${PATH}:${PWD}"

CLUSTER_NAME=ag-$(echo $RANDOM | md5sum | head -c 7)
export CLUSTER_NAME
./tests/integration/scripts/provision-gardener-gh.sh
./hack/ci/provision-gardener-gh.sh

echo "waiting for Gardener to finish shoot reconcile..."
kubectl wait --kubeconfig "${GARDENER_KUBECONFIG}" --for=jsonpath='{.status.lastOperation.state}'=Succeeded --timeout=600s "shoots/${CLUSTER_NAME}"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 0 additions & 16 deletions tests/integration/scripts/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions tests/integration/scripts/custom-domain-gardener-aws.sh

This file was deleted.

18 changes: 0 additions & 18 deletions tests/integration/scripts/custom-domain-gardener-gcp.sh

This file was deleted.

93 changes: 0 additions & 93 deletions tests/integration/scripts/custom-domain-gardener.sh

This file was deleted.

26 changes: 0 additions & 26 deletions tests/integration/scripts/jobguard.sh

This file was deleted.

60 changes: 0 additions & 60 deletions tests/integration/scripts/provision-gardener.sh

This file was deleted.

26 changes: 0 additions & 26 deletions tests/integration/scripts/test-gardener-aws.sh

This file was deleted.

30 changes: 0 additions & 30 deletions tests/integration/scripts/test-gardener-gcp.sh

This file was deleted.

Loading

0 comments on commit 6a5a004

Please sign in to comment.