From 0f0c3410d7ba98755b0cf797e69fe6b645c113d3 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Tue, 1 Aug 2023 18:21:55 -0700 Subject: [PATCH] Remove GitLab related files --- .github/actions/smoke-tests/action.yaml | 2 +- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/update-docker-images.yml | 2 +- .gitlab-ci.yml | 4 ---- tests/{docker => }/Dockerfile | 0 tests/docker/gitlab.Dockerfile | 27 ---------------------- 7 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 .gitlab-ci.yml rename tests/{docker => }/Dockerfile (100%) delete mode 100644 tests/docker/gitlab.Dockerfile diff --git a/.github/actions/smoke-tests/action.yaml b/.github/actions/smoke-tests/action.yaml index fb85a75735..aa29e4822d 100644 --- a/.github/actions/smoke-tests/action.yaml +++ b/.github/actions/smoke-tests/action.yaml @@ -74,7 +74,7 @@ runs: - name: Build Test-Runner Container uses: docker/build-push-action@v3 with: - file: tests/docker/Dockerfile + file: tests/Dockerfile context: '.' cache-from: type=gha,scope=test-runner tags: test-runner:${{ github.sha }} diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3deeabcdce..c13a484ca0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,7 +16,7 @@ updates: interval: daily - package-ecosystem: docker - directory: /tests/docker + directory: /tests schedule: interval: daily diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ba7245364..f5bb13cf9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - name: Output Variables id: vars run: | - echo "k8s_latest=$(grep -m1 'FROM kindest/node' > $GITHUB_OUTPUT + echo "k8s_latest=$(grep -m1 'FROM kindest/node' > $GITHUB_OUTPUT echo "chart_version=$(yq '.version' > $GITHUB_OUTPUT echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT @@ -274,7 +274,7 @@ jobs: - name: Build Test-Runner Container uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1 with: - file: tests/docker/Dockerfile + file: tests/Dockerfile context: "." cache-from: type=gha,scope=test-runner cache-to: type=gha,scope=test-runner,mode=max diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index 6bcdbc106d..fa530b167b 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -52,7 +52,7 @@ jobs: - name: Set other variables id: vars run: | - echo "k8s_version=$(grep -m1 'FROM kindest/node' > $GITHUB_OUTPUT + echo "k8s_version=$(grep -m1 'FROM kindest/node' > $GITHUB_OUTPUT check: name: Check if updates are needed diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 71834b1c68..0000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,4 +0,0 @@ -include: - - project: "f5/nginx/kic/kic-pipelines" - file: "/include/ingress-controller.yml" - ref: "master" diff --git a/tests/docker/Dockerfile b/tests/Dockerfile similarity index 100% rename from tests/docker/Dockerfile rename to tests/Dockerfile diff --git a/tests/docker/gitlab.Dockerfile b/tests/docker/gitlab.Dockerfile deleted file mode 100644 index 640e88e50e..0000000000 --- a/tests/docker/gitlab.Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# syntax=docker/dockerfile:1.4 -FROM python:3.11 - -ARG HELM_VERSION=3.5.4 - -RUN apt-get update && apt-get install -y curl git jq apache2-utils apt-transport-https ca-certificates gnupg \ - && curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \ - && chmod +x ./kubectl \ - && mv ./kubectl /usr/local/bin \ - && echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \ - && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | tee /usr/share/keyrings/cloud.google.gpg \ - && apt-get update && apt-get install google-cloud-cli \ - && apt-get install google-cloud-sdk-gke-gcloud-auth-plugin \ - && curl -LO https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz \ - && tar -zxvf helm-v${HELM_VERSION}-linux-amd64.tar.gz \ - && mv linux-amd64/helm /usr/local/bin/helm - -WORKDIR /workspace/tests - -COPY --link tests/requirements.txt /workspace/tests/ -RUN python -m ensurepip --upgrade -RUN pip install --require-hashes -r requirements.txt - -COPY --link tests /workspace/tests -COPY --link deployments /workspace/deployments - -ENTRYPOINT ["python3", "-m", "pytest"]