Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#18554 v1.10 backport #18617

Merged
merged 2 commits into from Jan 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build-images-base.yaml
Expand Up @@ -20,7 +20,6 @@ concurrency:
jobs:
build-and-push:
timeout-minutes: 30
if: ${{ github.repository == 'cilium/cilium' }}
environment: release-base-images
runs-on: ubuntu-20.04
strategy:
Expand Down Expand Up @@ -112,7 +111,6 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

image-digests:
if: ${{ github.repository == 'cilium/cilium' }}
name: Display Digests
runs-on: ubuntu-20.04
needs: build-and-push
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build-images-ci.yaml
Expand Up @@ -10,6 +10,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand All @@ -19,7 +20,6 @@ concurrency:

jobs:
build-and-push-prs:
if: ${{ github.repository == 'cilium/cilium' }}
runs-on: ubuntu-20.04
strategy:
matrix:
Expand Down Expand Up @@ -180,7 +180,6 @@ jobs:
# this is caused by running apt while building the image
# which requires qemu setup in order to avoid x86/arm64 binaries mixups
build-and-push-with-qemu:
if: ${{ github.repository == 'cilium/cilium' }}
runs-on: ubuntu-20.04
strategy:
matrix:
Expand Down Expand Up @@ -257,7 +256,6 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

image-digests:
if: ${{ github.repository == 'cilium/cilium' }}
name: Display Digests
runs-on: ubuntu-20.04
needs: [build-and-push-prs, build-and-push-with-qemu]
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-images-hotfixes.yaml
Expand Up @@ -9,7 +9,6 @@ permissions: read-all

jobs:
build-and-push:
if: ${{ github.repository == 'cilium/cilium' }}
environment: release-developer-images
runs-on: ubuntu-20.04
strategy:
Expand Down Expand Up @@ -114,7 +113,6 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

image-digests:
if: ${{ github.repository == 'cilium/cilium' }}
name: Display Digests
runs-on: ubuntu-20.04
needs: build-and-push
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build-images-releases.yaml
Expand Up @@ -10,7 +10,6 @@ permissions: read-all

jobs:
build-and-push:
if: ${{ github.repository == 'cilium/cilium' }}
environment: release
runs-on: ubuntu-20.04
strategy:
Expand Down Expand Up @@ -118,7 +117,6 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

image-digests:
if: ${{ github.repository == 'cilium/cilium' }}
name: Display Digests
runs-on: ubuntu-20.04
needs: build-and-push
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/conformance-kind.yaml
Expand Up @@ -9,6 +9,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**
paths-ignore:
- 'Documentation/**'
- 'test/**'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/documentation.yaml
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint-bpf-checks.yaml
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/lint-codeql.yaml
Expand Up @@ -4,9 +4,11 @@ on:
pull_request:
branches:
- v1.10
- ft/v1.10/**
push:
branches:
- v1.10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jibi 👋 I'm going over the v1.11 backport of the same patch, and was wondering whether we need to add a line under branches here as well?

i.e.,

    branches:
        - v1.10
        - ft/v1.10/**

in the case of 1.10.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, for v1.11 we'll need to change that to ft/v1.11/**

- ft/v1.10/**
schedule:
- cron: "45 6 * * 3"

Expand All @@ -15,7 +17,7 @@ permissions: read-all
jobs:
check_changes:
name: Deduce required tests from code changes
if: ${{ github.repository == 'cilium/cilium' && github.event_name == 'pull_request' }}
if: ${{ github.event_name == 'pull_request' }}
runs-on: ubuntu-18.04
outputs:
go-changes: ${{ steps.go-changes.outputs.src }}
Expand All @@ -40,7 +42,7 @@ jobs:

analyze:
needs: check_changes
if: ${{ github.repository == 'cilium/cilium' && (needs.check_changes.outputs.go-changes == 'true' || github.event_name != 'pull_request') }}
if: ${{ needs.check_changes.outputs.go-changes == 'true' || github.event_name != 'pull_request' }}
runs-on: ubuntu-18.04
steps:
- name: Checkout repo
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint-go.yaml
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-images-base.yaml
Expand Up @@ -10,6 +10,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand All @@ -19,7 +20,6 @@ concurrency:

jobs:
lint:
if: github.repository == 'cilium/cilium'
name: Lint image build logic
runs-on: ubuntu-20.04
steps:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/tests-nightly.yaml
Expand Up @@ -8,7 +8,6 @@ permissions: read-all
jobs:
policy-stress-test:
name: Start Nightly Policy Stress tests
if: github.repository == 'cilium/cilium'
runs-on: ubuntu-18.04
steps:
- name: Request GKE test cluster
Expand All @@ -20,7 +19,6 @@ jobs:
args: --namespace=test-clusters --image=quay.io/cilium/cilium-test-ci:${{ github.sha }} "/usr/local/bin/cilium-test-gke.sh" "quay.io/cilium/cilium-ci:${{ github.sha }}" "quay.io/cilium/operator-generic-ci:${{ github.sha }}" "quay.io/cilium/hubble-relay-ci:${{ github.sha }}" "NightlyPolicyStress"
baseline-test:
name: Start performance test
if: github.repository == 'cilium/cilium'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests-smoke-ipv6.yaml
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand Down Expand Up @@ -43,7 +44,7 @@ jobs:

conformance-test-ipv6:
needs: check_changes
if: ${{ github.repository == 'cilium/cilium' && needs.check_changes.outputs.tested == 'true' }}
if: ${{ needs.check_changes.outputs.tested == 'true' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests-smoke.yaml
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- v1.10
- ft/v1.10/**

permissions: read-all

Expand Down Expand Up @@ -98,7 +99,7 @@ jobs:

conformance-test:
needs: check_changes
if: ${{ github.repository == 'cilium/cilium' && needs.check_changes.outputs.tested == 'true' }}
if: ${{ needs.check_changes.outputs.tested == 'true' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down