From 5d08ad00d22ed90a4b7374f687d6dd79847b27c4 Mon Sep 17 00:00:00 2001 From: Gromit Date: Wed, 27 Dec 2023 06:24:23 +0000 Subject: [PATCH] Auto generated from templates by gromit --- .github/workflows/release.yml | 131 ++++++++++++++++++++++++++-------- ci/Dockerfile.std | 9 +-- ci/aws/byol.pkr.hcl | 101 -------------------------- ci/goreleaser/goreleaser.yml | 2 +- ci/install/before_install.sh | 2 +- ci/install/post_install.sh | 2 +- ci/install/post_remove.sh | 2 +- ci/install/post_trans.sh | 2 +- 8 files changed, 110 insertions(+), 141 deletions(-) delete mode 100644 ci/aws/byol.pkr.hcl diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b9168d5b..fc28de713 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Dec 27 06:24:23 UTC 2023 # Distribution channels covered by this workflow # - Ubuntu and Debian @@ -12,10 +12,13 @@ name: Release on: pull_request: + branches: + - master + - 'release-*-lts' push: branches: - master - - release-** + - 'release-*-lts' tags: - 'v*' @@ -141,7 +144,7 @@ jobs: type=semver,pattern=v{{version}},prefix=v - name: CI push - if: ${{ matrix.golang_cross == '1.19-bullseye' }} + if: ${{ matrix.golang_cross == '1.19-bullseye' }} shell: bash env: t: ${{ steps.metadata.outputs.tags }} @@ -173,20 +176,95 @@ jobs: path: | dist/*.rpm !dist/*PAYG*.rpm - api-tests: + + test-controller: needs: goreleaser runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.scope.outputs.matrix }} + gd_tag: ${{ steps.versions.outputs.gd_tag }} + versions: ${{ steps.versions.outputs.versions }} + + steps: + - name: set version + id: versions + env: + GW_OR_DASH: ${{ (endsWith(github.repository, 'tyk') || endsWith(github.repository, 'tyk-analytics')) && 'yes' }} + BASE_REF: ${{ startsWith(github.event_name, 'pull_request') && github.base_ref || github.ref }} + # Cover pull_request_target too + PR: ${{startsWith(github.event_name, 'pull_request') && 'yes' }} + TAGS: ${{ needs.goreleaser.outputs.tags }} + shell: bash + run: | + tags=($TAGS) + gd_tag="master" + if [[ $GW_OR_DASH=='yes' && $PR=='yes' ]]; then + gd_tag=${BASE_REF##*/} + fi + # Multi line output parameter + echo "versions< versions.env + printf '::group::versions\n%s\::endgroup::' "$(cat versions.env)" # Add Tyk component config variations to $env_file cat confs/${{ matrix.conf }}.env >> local-${{ matrix.db }}.env # bring up env, the project name is important @@ -260,15 +328,15 @@ jobs: working-directory: auto id: test_execution run: | - echo "## API tests ${{ matrix.db }} ${{ matrix.conf }}" >> $GITHUB_STEP_SUMMARY + echo "### API tests ${{ matrix.db }} ${{ matrix.conf }}" >> $GITHUB_STEP_SUMMARY if docker run --rm --network auto_default --env-file pytest.env -v ${{ github.workspace }}/reports:/app/reports \ - ${{ steps.ecr.outputs.registry }}/tyk-automated-tests:${{ startsWith(github.ref_name, 'release-') && github.ref_name || 'master' }} \ - pytest -c pytest_ci.ini --ci -m "not local and not dind ${{ matrix.markers }}" > tests.out; then + ${{ steps.ecr.outputs.registry }}/tyk-automated-tests:${{ needs.test-controller.outputs.gd_tag }} \ + pytest -c pytest_ci.ini --ci -m "not local and not dind ${{ matrix.markers }}" | tee tests.out; then echo "All tests passed!" >> $GITHUB_STEP_SUMMARY else echo "::error title=API tests ${{ matrix.db }} ${{ matrix.conf }}::Test execution failed" cat tests.out >> $GITHUB_STEP_SUMMARY - docker compose -p auto -f pro-ha.yml -f deps_pro-ha.yml -f ${{ matrix.db }}.yml --env-file versions.env logs tyk tyk-analytics + docker logs tyk tyk-analytics exit 1 fi @@ -420,6 +488,7 @@ jobs: id-token: write # This is required for requesting the JWT contents: read # This is required for actions/checkout uses: ./.github/workflows/release-tests.yml + secrets: inherit sbom: diff --git a/ci/Dockerfile.std b/ci/Dockerfile.std index 810cda963..1fb5333c9 100644 --- a/ci/Dockerfile.std +++ b/ci/Dockerfile.std @@ -1,6 +1,7 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 -FROM debian:bullseye-slim +# Generated on: Wed Dec 27 06:24:23 UTC 2023 + +FROM ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive @@ -9,8 +10,8 @@ RUN apt-get update \ && apt-get dist-upgrade -y ca-certificates # Remove some things to decrease CVE surface -RUN dpkg --purge --force-remove-essential curl ncurses-base \ - && rm /usr/bin/passwd && rm /usr/sbin/adduser +RUN dpkg --purge --force-remove-essential curl ncurses-base || true +RUN rm -fv /usr/bin/passwd /usr/sbin/adduser || true # Clean up caches, unwanted .a and .o files RUN rm -rf /root/.cache \ diff --git a/ci/aws/byol.pkr.hcl b/ci/aws/byol.pkr.hcl deleted file mode 100644 index 71dc51a9f..000000000 --- a/ci/aws/byol.pkr.hcl +++ /dev/null @@ -1,101 +0,0 @@ - -# Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 - -packer { - required_plugins { - amazon = { - version = ">= 0.0.2" - source = "github.com/hashicorp/amazon" - } - } -} - -variable "flavour" { - description = "OS Flavour" - type = string -} - -variable "source_ami_owner" { - type = string -} - -variable "ami_search_string" { - type = string -} - -variable "region" { - type = string - default = "us-east-1" -} - -variable "version" { - type = string - default = "${env("VERSION")}" -} - -# Latest at this time -data "amazon-ami" "base-os" { - filters = { - architecture = "x86_64" - "block-device-mapping.volume-type" = "gp2" - name = "${var.ami_search_string}" - root-device-type = "ebs" - sriov-net-support = "simple" - virtualization-type = "hvm" - } - most_recent = true - owners = ["${var.source_ami_owner}"] -} - -# source blocks are generated from your builders; a source can be referenced in -# build blocks. A build block runs provisioner and post-processors on a -# source. Read the documentation for source blocks here: -# https://www.packer.io/docs/from-1.5/blocks/source -source "amazon-ebs" "byol" { - ami_name = "BYOL tyk-pump ${var.version} (${var.flavour})" - ena_support = true - force_delete_snapshot = true - force_deregister = true - instance_type = "t3.micro" - region = "${var.region}" - source_ami = data.amazon-ami.base-os.id - sriov_support = true - ssh_username = "ec2-user" - subnet_filter { - filters = { - "tag:Class" = "build" - } - most_free = true - random = false - } - tags = { - Component = "tyk-pump" - Flavour = "${var.flavour}" - Product = "byol" - Version = "${var.version}" - } -} - -# a build block invokes sources and runs provisioning steps on them. The -# documentation for build blocks can be found here: -# https://www.packer.io/docs/from-1.5/blocks/build -build { - sources = ["source.amazon-ebs.byol"] - provisioner "file" { - destination = "/tmp/semver.sh" - source = "utils/semver.sh" - } - provisioner "file" { - destination = "/tmp/tyk-pump.rpm" - sources = fileset(".", "rpm/*x86_64.rpm") - } - provisioner "file" { - destination = "/tmp/10-run-tyk.conf" - source = "utils/10-run-tyk.conf" - } - provisioner "shell" { - environment_vars = ["VERSION=${var.version}" ] - script = "byol/install-tyk-pump.sh" - } -} diff --git a/ci/goreleaser/goreleaser.yml b/ci/goreleaser/goreleaser.yml index a581a0595..fd246b585 100644 --- a/ci/goreleaser/goreleaser.yml +++ b/ci/goreleaser/goreleaser.yml @@ -1,5 +1,5 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Dec 27 06:24:23 UTC 2023 # Check the documentation at http://goreleaser.com # This project needs CGO_ENABLED=1 and the cross-compiler toolchains for diff --git a/ci/install/before_install.sh b/ci/install/before_install.sh index 1d9d378f5..599debd4c 100755 --- a/ci/install/before_install.sh +++ b/ci/install/before_install.sh @@ -1,7 +1,7 @@ #!/bin/bash # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Dec 27 06:24:23 UTC 2023 echo "Creating user and group..." GROUPNAME="tyk" diff --git a/ci/install/post_install.sh b/ci/install/post_install.sh index 4ff5aa316..01d01035e 100755 --- a/ci/install/post_install.sh +++ b/ci/install/post_install.sh @@ -2,7 +2,7 @@ # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Dec 27 06:24:23 UTC 2023 # If "True" the install directory ownership will be changed to "tyk:tyk" change_ownership="True" diff --git a/ci/install/post_remove.sh b/ci/install/post_remove.sh index 76f83c4fe..c175ef086 100755 --- a/ci/install/post_remove.sh +++ b/ci/install/post_remove.sh @@ -1,7 +1,7 @@ #!/bin/sh # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Dec 27 06:24:23 UTC 2023 cleanRemove() { diff --git a/ci/install/post_trans.sh b/ci/install/post_trans.sh index de77ca59c..488de7c4f 100644 --- a/ci/install/post_trans.sh +++ b/ci/install/post_trans.sh @@ -1,7 +1,7 @@ #!/bin/sh # Generated by: gromit policy -# Generated on: Wed Nov 29 23:09:25 UTC 2023 +# Generated on: Wed Dec 27 06:24:23 UTC 2023 if command -V systemctl >/dev/null 2>&1; then if [ ! -f /lib/systemd/system/tyk-pump.service ]; then