Merge remote-tracking branch 'origin/w/126.0/bugfix/fix-ci-124' into …

…w/127.0/bugfix/fix-ci-124
scality · Jul 25, 2024 · c45dba6 · c45dba6
2 parents 79d4e86 + 1fa0d08
commit c45dba6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.github/actions/bastion-tests/action.yaml b/.github/actions/bastion-tests/action.yaml
@@ -38,7 +38,6 @@ runs:
       uses: ./.github/actions/run-command-ssh
       with:
         NODE: bastion
-        SSH_OPTIONS: "-o ServerAliveInterval=15"
         COMMAND: |
           cd metalk8s
           export SSH_CONFIG_FILE=\"/home/centos/ssh_config\"

diff --git a/.github/actions/run-command-ssh/action.yaml b/.github/actions/run-command-ssh/action.yaml
@@ -16,7 +16,7 @@ inputs:
   SSH_OPTIONS:
     description: "Additional args passed to ssh"
     required: false
-    default: ""
+    default: "-o ServerAliveInterval=15"
 
 runs:
   using: "composite"

diff --git a/.github/actions/run-k8s-conformance/action.yaml b/.github/actions/run-k8s-conformance/action.yaml
@@ -42,7 +42,6 @@ runs:
       with:
         COMMAND: |
           sudo ./sonobuoy run --kubeconfig=/etc/kubernetes/admin.conf --mode=certified-conformance --wait
-        SSH_OPTIONS: "-o ServerAliveInterval=15"
     - name: Retrieve conformance tests result
       uses: ./.github/actions/run-command-ssh
       with:

diff --git a/buildchain/buildchain/constants.py b/buildchain/buildchain/constants.py
@@ -24,7 +24,7 @@
 DOCKER_REPOSITORY: str = "docker.io/library"
 FLUENT_REPOSITORY: str = "cr.fluentbit.io/fluent"
 GRAFANA_REPOSITORY: str = "docker.io/grafana"
-INGRESS_REPOSITORY: str = "k8s.gcr.io/ingress-nginx"
+INGRESS_REPOSITORY: str = f"{K8S_REPOSITORY}/ingress-nginx"
 KIWIGRID_REPOSITORY: str = "quay.io/kiwigrid"
 KUBE_STATE_METRICS_REPOSITORY: str = f"{K8S_REPOSITORY}/kube-state-metrics"
 PROMETHEUS_ADAPTER_REPOSITORY: str = f"{K8S_REPOSITORY}/prometheus-adapter"