argoci: make scaffold scripts bug-for-bug identical to Semaphore #13153
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,142 @@ | ||||||
| #!/usr/bin/env bash | ||||||
| # body_flannel-migration.sh - flannel-to-Calico migration test flow. | ||||||
|
Contributor
There was a problem hiding this comment. This script is added here, but nothing seems to invoke it yet — I don't see any cron or template referencing |
||||||
| # | ||||||
| # Provisions a cluster, installs flannel + a CNI plugin helper, runs a basic | ||||||
| # connectivity smoke test, applies Calico + the flannel-migration job, waits | ||||||
| # for the migration to complete, then runs the full e2e suite on Calico. | ||||||
| # | ||||||
| # Uses the legacy `./bz.sh tests:run` test runner (not the in-repo binary). | ||||||
| # When the in-repo binary reaches parity, this script can migrate to | ||||||
| # `make e2e-run` like body_standard.sh's run_tests_local.sh phase. | ||||||
| set -exo pipefail | ||||||
|
|
||||||
| PHASES="$(cd "$(dirname "$0")" && pwd)/phases" | ||||||
|
|
||||||
| echo "[INFO] starting job..." | ||||||
|
|
||||||
| export CNI_VERSION=${CNI_VERSION:-"v1.1.1"} | ||||||
| export DOCS_BASE=${DOCS_BASE:-"https://github.com/projectcalico/calico"} | ||||||
| export DOWNLEVEL_MANIFEST=${DOWNLEVEL_MANIFEST:-"https://github.com/projectcalico/calico/raw/release-${RELEASE_STREAM}/manifests/canal.yaml"} | ||||||
|
There was a problem hiding this comment.
|
||||||
| export CALICO_MANIFEST=${CALICO_MANIFEST:-"manifests/flannel-migration/calico.yaml"} | ||||||
| export MIGRATION_MANIFEST=${MIGRATION_MANIFEST:-"manifests/flannel-migration/migration-job.yaml"} | ||||||
|
|
||||||
| if [ "${USE_HASH_RELEASE}" == "true" ]; then | ||||||
| echo "[INFO] Using hash release for flannel migration" | ||||||
| LATEST_HASHREL="https://latest-os.docs.eng.tigera.net/${RELEASE_STREAM}.txt" | ||||||
| echo "Checking ${LATEST_HASHREL} for latest hash release url..." | ||||||
| DOCS_URL=$(curl --retry 9 --retry-all-errors -sS ${LATEST_HASHREL}) | ||||||
| echo "Using $DOCS_URL for hash release base url" | ||||||
| else | ||||||
| if [[ "${RELEASE_STREAM}" == "master" ]]; then | ||||||
| echo "Cannot use latest release on master branch" | ||||||
| exit 1 | ||||||
| else | ||||||
| echo "[INFO] Using latest release for flannel migration" | ||||||
| export DOCS_URL=$DOCS_BASE/raw/release-${RELEASE_STREAM} | ||||||
| fi | ||||||
| fi | ||||||
|
|
||||||
| export BZ_LOCAL=${BZ_HOME}/.local | ||||||
| export KUBECONFIG=$BZ_LOCAL/kubeconfig | ||||||
| export PATH=$PATH:$BZ_LOCAL/bin | ||||||
|
|
||||||
| # Modern OSes no longer include br_netfilter by default, which breaks flannel. | ||||||
| echo "[INFO] installing br_netfilter..." | ||||||
| sudo modprobe br_netfilter | ||||||
|
|
||||||
| mkdir -p "$BZ_LOGS_DIR" | ||||||
| cd "${BZ_HOME}" | ||||||
| source "${PHASES}/provision.sh" | ||||||
|
|
||||||
| # Install bridge CNI plugin (needed by kube-flannel manifest). | ||||||
| kubectl apply -f - <<EOF | ||||||
| apiVersion: apps/v1 | ||||||
| kind: DaemonSet | ||||||
| metadata: | ||||||
| name: cni-installer | ||||||
| namespace: kube-system | ||||||
| labels: | ||||||
| app: cni-installer | ||||||
| spec: | ||||||
| selector: | ||||||
| matchLabels: | ||||||
| app: cni-installer | ||||||
| template: | ||||||
| metadata: | ||||||
| labels: | ||||||
| app: cni-installer | ||||||
| spec: | ||||||
| nodeSelector: | ||||||
| kubernetes.io/os: linux | ||||||
| hostNetwork: true | ||||||
| terminationGracePeriodSeconds: 0 | ||||||
| tolerations: | ||||||
| - effect: NoSchedule | ||||||
| operator: Exists | ||||||
| - key: CriticalAddonsOnly | ||||||
| operator: Exists | ||||||
| - effect: NoExecute | ||||||
| operator: Exists | ||||||
| terminationGracePeriodSeconds: 0 | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| priorityClassName: system-node-critical | ||||||
| securityContext: | ||||||
| seccompProfile: | ||||||
| type: RuntimeDefault | ||||||
| initContainers: | ||||||
| - name: cni-installer | ||||||
| image: quay.io/dosmith/cni-plugins:gen4 | ||||||
|
There was a problem hiding this comment.
|
||||||
| command: ["/bin/bash", "-c", "cp -f /usr/src/plugins/bin/* /opt/cni/bin"] | ||||||
| volumeMounts: | ||||||
| - name: bindir | ||||||
| mountPath: /opt/cni/bin | ||||||
| securityContext: | ||||||
| privileged: true | ||||||
| resources: | ||||||
| requests: | ||||||
| cpu: 10m | ||||||
| memory: 10Mi | ||||||
| containers: | ||||||
| - name: pause | ||||||
| image: registry.k8s.io/pause | ||||||
| resources: | ||||||
| requests: | ||||||
| cpu: 10m | ||||||
| memory: 10Mi | ||||||
| volumes: | ||||||
| - name: bindir | ||||||
| hostPath: | ||||||
| path: /opt/cni/bin | ||||||
| EOF | ||||||
|
|
||||||
| # Update flannel.yaml to use the podCIDR that CRC sets up. | ||||||
| wget -O flannel.yaml "$DOWNLEVEL_MANIFEST" | ||||||
| sed -i "s?10.244.0.0/16?192.168.0.0/16?g" ./flannel.yaml | ||||||
| kubectl apply -f - < ./flannel.yaml | ||||||
| sleep 30 # wait for flannel to come up | ||||||
| kubectl get po -A -owide | ||||||
|
|
||||||
| # Run a basic services test to check that flannel networking is working. | ||||||
| K8S_E2E_FLAGS='--ginkgo.focus=should.serve.a.basic.endpoint.from.pods' \ | ||||||
| ./bz.sh tests:run |& tee >(gzip --stdout > "${BZ_LOGS_DIR}/e2e-tests-pre.log") | ||||||
|
There was a problem hiding this comment. Nit: these |
||||||
|
|
||||||
| kubectl delete -n kube-system ds cni-installer || true # remove the CNI installer daemonset | ||||||
| kubectl apply -f "$DOCS_URL/$CALICO_MANIFEST" | ||||||
| wget -O calico-migration.yaml "$DOCS_URL/$MIGRATION_MANIFEST" | ||||||
| kubectl apply -f - < ./calico-migration.yaml | ||||||
| sleep 5 # make sure the job has started before we check its status | ||||||
| kubectl -n kube-system get jobs flannel-migration | ||||||
| kubectl -n kube-system describe jobs flannel-migration | ||||||
| kubectl get po -A -owide | ||||||
| kubectl wait --for=condition=complete --timeout=600s -n kube-system job/flannel-migration | ||||||
|
There was a problem hiding this comment. Nit: |
||||||
| kubectl -n kube-system get jobs flannel-migration | ||||||
| kubectl -n kube-system describe jobs flannel-migration | ||||||
| kubectl -n kube-system logs -l k8s-app=flannel-migration-controller | ||||||
| kubectl get po -A -owide | ||||||
|
|
||||||
| # Delete the migration job because the presence of a non-Running pod in | ||||||
| # kube-system upsets the e2es. | ||||||
| kubectl -n kube-system delete job/flannel-migration || true | ||||||
| kubectl -n kube-system delete po -l k8s-app=flannel-migration-controller || true | ||||||
|
|
||||||
| # Run e2e on uplevel calico. | ||||||
| ./bz.sh tests:run |& tee >(gzip --stdout > "${BZ_LOGS_DIR}/e2e-tests.log") | ||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,12 @@ | ||
| #!/usr/bin/env bash | ||
| # run_tests.sh - acquire an e2e binary and run it, or defer to bz tests. | ||
| # | ||
| # Selection (automatic, matches Semaphore): | ||
| # - TEST_TYPE == k8s-e2e → run the monorepo e2e binary via `make e2e-run`. | ||
| # The binary is acquired first: built from local source when RUN_LOCAL_TESTS | ||
| # is set (per-PR CI), otherwise downloaded from the hashrelease (scheduled | ||
| # CI). E2E_TEST_CONFIG selects specs and may be empty (default config). | ||
| # - Else (non-e2e test types: benchmarks, certification, etc.) → `bz tests`. | ||
| # | ||
| # Required env: | ||
| # BZ_LOCAL_DIR, BZ_LOGS_DIR, HOME, REPORT_DIR, TEST_TYPE | ||
|
|
@@ -34,7 +28,7 @@ if [[ -n "${RUN_LOCAL_TESTS:-}" ]]; then | |
| make -C e2e build |& tee >(gzip --stdout > "${BZ_LOGS_DIR}/${TEST_TYPE}-build.log.gz") | ||
| E2E_BINARY=/go/src/github.com/projectcalico/calico/e2e/bin/k8s/e2e.test | ||
| popd || exit | ||
| elif [[ "${TEST_TYPE}" == "k8s-e2e" ]]; then | ||
| # Scheduled CI: download the pre-built e2e binary from the hashrelease. | ||
| echo "[INFO] downloading e2e binary from hashrelease..." | ||
| HASHREL_URL=$(curl --retry 9 --retry-all-errors -sS "https://latest-os.docs.eng.tigera.net/${RELEASE_STREAM}.txt") | ||
|
|
@@ -48,10 +42,10 @@ elif [[ "${TEST_TYPE}" == "k8s-e2e" && -n "${E2E_TEST_CONFIG:-}" ]]; then | |
| fi | ||
|
|
||
| # E2E_BINARY is a set/unset sentinel (its value is not used here -- make | ||
| # e2e-run locates the binary itself). Take the structured path whenever a | ||
| # k8s-e2e binary was acquired above; non-e2e test types fall through to bz | ||
| # tests below. E2E_TEST_CONFIG may be empty (selects the default config). | ||
| if [[ -n "${E2E_BINARY:-}" ]]; then | ||
|
There was a problem hiding this comment. This gate change (dropping
If historical Semaphore ran these nftables jobs through There was a problem hiding this comment. Agreed — I confirmed the same when checking against |
||
| echo "[INFO] starting e2e tests..." | ||
| pushd "${CI_HOME}/${CI_GIT_DIR}" || exit | ||
|
|
||
|
|
@@ -82,6 +76,14 @@ if [[ -n "${E2E_BINARY:-}" && -n "${E2E_TEST_CONFIG:-}" ]]; then | |
| # the container, and we prepend that to PATH inside the bash -c below. | ||
| make kubectl | ||
|
|
||
| # EKS kubeconfigs exec aws-iam-authenticator (PATH lookup), which the stock | ||
| # golang image lacks, so client-go fails before any tests run. The aws-eks | ||
| # provisioner installs it on the host; bind-mount it when present (no-op otherwise). | ||
| auth_mount=() | ||
| if [[ -x "${BZ_LOCAL_DIR}/bin/aws-iam-authenticator" ]]; then | ||
| auth_mount=(-v "${BZ_LOCAL_DIR}/bin/aws-iam-authenticator:/usr/local/bin/aws-iam-authenticator:ro") | ||
| fi | ||
|
|
||
| # Capture the exit code so the JUnit copy below runs even when tests fail | ||
| # (set -e would otherwise bail out before the cp). | ||
| e2e_rc=0 | ||
|
|
@@ -92,6 +94,7 @@ if [[ -n "${E2E_BINARY:-}" && -n "${E2E_TEST_CONFIG:-}" ]]; then | |
| -e KUBECONFIG=/kubeconfig \ | ||
| -e PRODUCT=${PRODUCT:-calico} \ | ||
| ${K8S_E2E_DOCKER_EXTRA_FLAGS:-} \ | ||
| "${auth_mount[@]}" \ | ||
| -v "$(pwd)":/go/src/github.com/projectcalico/calico:rw \ | ||
| -v "$(pwd)"/.go-pkg-cache:/go-cache:rw \ | ||
| -v "${BZ_LOCAL_DIR}/kubeconfig:/kubeconfig:ro" \ | ||
|
|
@@ -115,8 +118,7 @@ if [[ -n "${E2E_BINARY:-}" && -n "${E2E_TEST_CONFIG:-}" ]]; then | |
| # Propagate the original test exit code. | ||
| exit ${e2e_rc} | ||
| else | ||
| # Non-e2e test types (benchmarks, certification, etc.) -- defer to bz. | ||
| echo "[INFO] starting bz testing (K8S_E2E_FLAGS=${K8S_E2E_FLAGS:-<none>})..." | ||
| bz tests ${VERBOSE} |& tee >(gzip --stdout > "${BZ_LOGS_DIR}/${TEST_TYPE}-tests.log.gz") | ||
| fi | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This exports
ARGO_WORKFLOW_UID, but I can't find anything that reads it — the epilogue builds the artifact path fromARGO_WORKFLOW_NAME, not the UID, and there are no other references in.argoci/. Was it meant to be used somewhere (e.g. to keep artifact paths unique across workflow re-runs, since the name can repeat)? If not, it looks like a dead export and can be dropped. Also, it's only set in this one cron — if it's meant to be a standard var, it should probably live wherever the other crons pick up their shared exports.