Skip to content

Commit

Permalink
Release 2023 01 17.1.f4e71a7 (#739)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhaus67 authored Jan 17, 2023
2 parents d32c593 + 5feb0f9 commit cac94a5
Show file tree
Hide file tree
Showing 72 changed files with 2,420 additions and 1,721 deletions.
74 changes: 74 additions & 0 deletions .github/workflows/rds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# This runs tests that check the AWS RDS provisioning / deprovisioning logic
name: AWS integration tests

on:
push:
branches:
- main
- release
paths-ignore:
- '*.md'
- '*.sh'
- '.github/*.md'
- '.github/workflows/openapi_update.yaml'
- '.github/CODEOWNERS'
- 'templates/**'
- '.openapi-generator-ignore'
- 'openapi/**'
- 'docs/**'
- 'pkg/api/openapi/docs/**'
- 'pkg/api/openapi/.openapi-generator-ignore'

pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- '*.md'
- '*.sh'
- '.github/*.md'
- '.github/workflows/openapi_update.yaml'
- '.github/CODEOWNERS'
- 'templates/**'
- '.openapi-generator-ignore'
- 'openapi/**'
- 'docs/**'
- 'pkg/api/openapi/docs/**'
- 'pkg/api/openapi/.openapi-generator-ignore'

jobs:
verify-test:
name: "Test RDS Provisioning"
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
environment: development
steps:
- name: Set up Go 1.18
uses: actions/setup-go@v2
with:
go-version: "1.18"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: Cache go module
uses: actions/cache@v2
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1-node16
with:
aws-region: ${{ secrets.AWS_REGION }}
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/github
- name: Verify & Test
env:
AWS_REGION: ${{ secrets.AWS_REGION }}
AWS_AUTH_HELPER: "none"
run: |
set -euo pipefail
source "scripts/lib/external_config.sh"
init_chamber
run_chamber exec fleetshard-sync -- make test/rds
timeout-minutes: 35
26 changes: 2 additions & 24 deletions .openshift-ci/e2e-runtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,6 @@
FROM quay.io/centos/centos:stream9

RUN rm -f /etc/yum.repos.d/* && { \
echo "[baseos]"; \
echo "name=CentOS Stream \$releasever - BaseOS"; \
echo "baseurl=http://mirror.stream.centos.org/\$releasever-stream/BaseOS/\$basearch/os/"; \
echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial"; \
echo "gpgcheck=1"; \
echo "repo_gpgcheck=0"; \
echo "metadata_expire=6h"; \
echo "countme=1"; \
echo "enabled=1"; \
echo; \
echo "[appstream]"; \
echo "name=CentOS Stream $releasever - AppStream"; \
echo "baseurl=http://mirror.stream.centos.org/\$releasever-stream/AppStream/\$basearch/os/"; \
echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial"; \
echo "gpgcheck=1"; \
echo "repo_gpgcheck=0"; \
echo "metadata_expire=6h"; \
echo "countme=1"; \
echo "enabled=1"; \
} > "/etc/yum.repos.d/centos.repo"

RUN dnf update -y && dnf -y install make which git gettext jq gcc && dnf clean all && rm -rf /var/cache/dnf
RUN dnf update -y --disablerepo=\* --enablerepo=baseos,appstream && dnf -y install make which git gettext jq gcc && dnf clean all && rm -rf /var/cache/dnf

COPY --from=registry.ci.openshift.org/openshift/release:golang-1.18 /usr/local/go /usr/local/go
COPY --from=quay.io/openshift/origin-cli:4.13 /usr/bin/oc /usr/bin
Expand Down Expand Up @@ -58,6 +36,6 @@ RUN mkdir /src $GOPATH
WORKDIR /src

COPY . .
RUN chmod 775 -R /src && chmod 775 -R $GOPATH
RUN chmod 775 -R /src && chmod 775 -R $GOPATH && git config --system --add safe.directory /src

CMD ./.openshift-ci/tests/e2e.sh
3 changes: 1 addition & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ repos:
stages: [push, manual]
files: '(openapi/.*|pkg/workers/worker_interface.go|pkg/client/ocm/id.go|pkg/client/aws/client.go|pkg/client/ocm/client.go|pkg/client/iam/client.go|pkg/services/authorization/authorization.go|pkg/services/sso/iam_service.go|pkg/client/redhatsso/client.go|pkg/auth/auth_agent_service.go|internal/dinosaur/pkg/services/observatorium_service.go|internal/dinosaur/pkg/services/cluster_placement_strategy.go|internal/dinosaur/pkg/services/cloud_providers.go|internal/dinosaur/pkg/services/clusters.go|internal/dinosaur/pkg/services/quota.go|internal/dinosaur/pkg/services/fleetshard_operator_addon.go|internal/dinosaur/pkg/services/quota_service_factory.go|internal/dinosaur/pkg/clusters/cluster_builder.go|internal/dinosaur/pkg/clusters/provider.go|internal/dinosaur/pkg/services/dinosaur.go)'
- repo: https://github.com/Yelp/detect-secrets
rev: v1.2.0
rev: v1.4.0
hooks:
- id: detect-secrets
args: ["--baseline", ".secrets.baseline"]
exclude: ^pkg/client/redhatsso/api/
- repo: https://github.com/golangci/golangci-lint
rev: v1.50.1
hooks:
Expand Down
Loading

0 comments on commit cac94a5

Please sign in to comment.