From 3d8adcec6072612dbcb3107073e0ed6a3031c947 Mon Sep 17 00:00:00 2001 From: Elib <73884315+ebattat@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:58:57 +0300 Subject: [PATCH] fix github secret (#900) --- .github/workflows/Perf_Env_E2E_Test_CI.yml | 10 +++++----- .github/workflows/Weekly_Perf_Env_Installer_CI.yml | 10 +++++----- .github/workflows/Weekly_Perf_Env_Operator_CI.yml | 4 ++-- benchmark_runner/common/github/github_operations.py | 4 ++-- .../common/ocp_resources/create_ocp_resource.py | 2 +- benchmark_runner/main/environment_variables.py | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/Perf_Env_E2E_Test_CI.yml b/.github/workflows/Perf_Env_E2E_Test_CI.yml index ee9817800..759449e99 100644 --- a/.github/workflows/Perf_Env_E2E_Test_CI.yml +++ b/.github/workflows/Perf_Env_E2E_Test_CI.yml @@ -84,7 +84,7 @@ jobs: QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} IBM_API_KEY: ${{ secrets.IBM_API_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }} PROVISION_IP: ${{ secrets.PERF_PROVISION_IP }} PROVISION_USER: ${{ secrets.PERF_PROVISION_USER }} @@ -112,13 +112,13 @@ jobs: # scp -r "$RUNNER_PATH/nightly_cnv_registered.sh" provision:"/tmp/nightly_cnv_registered.sh" # ssh -t provision "chmod +x /tmp/nightly_cnv_registered.sh;/tmp/./nightly_cnv_registered.sh;oc create -f /tmp/cnv_nightly_catlog_source.yaml;rm -f /tmp/nightly_cnv_registered.sh;rm -f /tmp/cnv_nightly_catlog_source.yaml" #fi - #podman run --rm -e IBM_API_KEY="$IBM_API_KEY" -e GITHUB_TOKEN="$GITHUB_TOKEN" -e KUBEADMIN_PASSWORD="$KUBEADMIN_PASSWORD" -e INSTALL_OCP_RESOURCES="True" -e CNV_VERSION="$CNV_VERSION" -e QUAY_USERNAME="$QUAY_USERNAME" -e QUAY_PASSWORD="$QUAY_PASSWORD" -e ODF_VERSION="$ODF_VERSION" -e NUM_ODF_DISK="$NUM_ODF_DISK" -e INSTALL_RESOURCES_LIST="['${{ matrix.resource }}']" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_OC_USER="$PROVISION_OC_USER" -e PROVISION_PORT="$PROVISION_PORT" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "$KUBECONFIG_PATH":"$CONTAINER_KUBECONFIG_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" + #podman run --rm -e IBM_API_KEY="$IBM_API_KEY" -e GIT_TOKEN="$GIT_TOKEN" -e KUBEADMIN_PASSWORD="$KUBEADMIN_PASSWORD" -e INSTALL_OCP_RESOURCES="True" -e CNV_VERSION="$CNV_VERSION" -e QUAY_USERNAME="$QUAY_USERNAME" -e QUAY_PASSWORD="$QUAY_PASSWORD" -e ODF_VERSION="$ODF_VERSION" -e NUM_ODF_DISK="$NUM_ODF_DISK" -e INSTALL_RESOURCES_LIST="['${{ matrix.resource }}']" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_OC_USER="$PROVISION_OC_USER" -e PROVISION_PORT="$PROVISION_PORT" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "$KUBECONFIG_PATH":"$CONTAINER_KUBECONFIG_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" #echo '>>>>>>>>>>>>>>>>>>>>>>>>>>> End ${{ matrix.resource }} installation >>>>>>>>>>>>>>>>>>>>>>>>>>>>' #end=$(printf '%(%s)T' -1) #echo "INSTALL_OCP_RESOURCE_MINUTES_TIME=$(( (( end - start )) / 60))" >> "$GITHUB_ENV" - id: ocp_install_resource_step run: echo "install_resource_time=$INSTALL_OCP_RESOURCE_MINUTES_TIME" >> $GITHUB_OUTPUT - - name: ☉ Rerun OCP Operator Reources install after failure + - name: ☉ Rerun OCP Operator Resources install after failure env: CNV_VERSION: "4.10" ODF_VERSION: "4.9" @@ -126,7 +126,7 @@ jobs: QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} IBM_API_KEY: ${{ secrets.IBM_API_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }} PROVISION_IP: ${{ secrets.PERF_PROVISION_IP }} PROVISION_USER: ${{ secrets.PERF_PROVISION_USER }} @@ -152,7 +152,7 @@ jobs: #scp -r "$RUNNER_PATH/cnv_nightly_catlog_source.yaml" provision:"/tmp/cnv_nightly_catlog_source.yaml" #scp -r "$RUNNER_PATH/nightly_cnv_registered.sh" provision:"/tmp/nightly_cnv_registered.sh" #ssh -t provision "chmod +x /tmp/nightly_cnv_registered.sh;/tmp/./nightly_cnv_registered.sh;oc create -f /tmp/cnv_nightly_catlog_source.yaml;rm -f /tmp/nightly_cnv_registered.sh;rm -f /tmp/cnv_nightly_catlog_source.yaml" - #podman run --rm -e IBM_API_KEY="$IBM_API_KEY" -e GITHUB_TOKEN="$GITHUB_TOKEN" -e KUBEADMIN_PASSWORD="$KUBEADMIN_PASSWORD" -e INSTALL_OCP_RESOURCES="True" -e CNV_VERSION="$CNV_VERSION" -e QUAY_USERNAME="$QUAY_USERNAME" -e QUAY_PASSWORD="$QUAY_PASSWORD" -e ODF_VERSION="$ODF_VERSION" -e NUM_ODF_DISK="$NUM_ODF_DISK" -e INSTALL_RESOURCES_LIST="['lso', 'odf', 'infra', 'kata', 'cnv', 'custom']" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_OC_USER="$PROVISION_OC_USER" -e PROVISION_PORT="$PROVISION_PORT" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "$KUBECONFIG_PATH":"$CONTAINER_KUBECONFIG_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" + #podman run --rm -e IBM_API_KEY="$IBM_API_KEY" -e GIT_TOKEN="$GIT_TOKEN" -e KUBEADMIN_PASSWORD="$KUBEADMIN_PASSWORD" -e INSTALL_OCP_RESOURCES="True" -e CNV_VERSION="$CNV_VERSION" -e QUAY_USERNAME="$QUAY_USERNAME" -e QUAY_PASSWORD="$QUAY_PASSWORD" -e ODF_VERSION="$ODF_VERSION" -e NUM_ODF_DISK="$NUM_ODF_DISK" -e INSTALL_RESOURCES_LIST="['lso', 'odf', 'infra', 'kata', 'cnv', 'custom']" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_OC_USER="$PROVISION_OC_USER" -e PROVISION_PORT="$PROVISION_PORT" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "$KUBECONFIG_PATH":"$CONTAINER_KUBECONFIG_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> End OCP Resource Install >>>>>>>>>>>>>>>>>>>>>>>>>>>>' end=$(printf '%(%s)T' -1) echo "INSTALL_OCP_RESOURCE_MINUTES_TIME=$(( (( end - start )) / 60))" >> "$GITHUB_ENV" diff --git a/.github/workflows/Weekly_Perf_Env_Installer_CI.yml b/.github/workflows/Weekly_Perf_Env_Installer_CI.yml index bd5d3a964..cf5259b33 100644 --- a/.github/workflows/Weekly_Perf_Env_Installer_CI.yml +++ b/.github/workflows/Weekly_Perf_Env_Installer_CI.yml @@ -59,7 +59,7 @@ jobs: INSTALL_OCP_VERSION: "latest-4.16" OCP_CLIENT_VERSION: "4.16.0" IBM_API_KEY: ${{ secrets.IBM_API_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }} PROVISION_IP: ${{ secrets.PERF_PROVISION_IP }} PROVISION_USER: ${{ secrets.PERF_PROVISION_USER }} @@ -76,14 +76,14 @@ jobs: build=$(pip freeze | grep benchmark-runner | sed 's/==/=/g') build_version="$(cut -d'=' -f2 <<<"$build")" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP start step: ${{ matrix.step }} >>>>>>>>>>>>>>>>>>>>>>>>>>>>' - podman run --rm -e OCP_ENV_FLAVOR="PERF" -e IBM_API_KEY="$IBM_API_KEY" -e GITHUB_TOKEN="$GITHUB_TOKEN" -e INSTALL_OCP_VERSION="$INSTALL_OCP_VERSION" -e INSTALL_STEP="${{ matrix.step }}" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_PORT="$PROVISION_PORT" -e PROVISION_KUBEADMIN_PASSWORD_PATH="$PROVISION_KUBEADMIN_PASSWORD_PATH" -e PROVISION_KUBECONFIG_PATH="$PROVISION_KUBECONFIG_PATH" -e PROVISION_INSTALLER_PATH="$PROVISION_INSTALLER_PATH" -e PROVISION_INSTALLER_CMD="$PROVISION_INSTALLER_CMD" -e PROVISION_INSTALLER_LOG="$PROVISION_INSTALLER_LOG" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "/$RUNNER_PATH/.ssh/config":"/$PROVISION_USER/.ssh/config" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" + podman run --rm -e OCP_ENV_FLAVOR="PERF" -e IBM_API_KEY="$IBM_API_KEY" -e GIT_TOKEN="$GIT_TOKEN" -e INSTALL_OCP_VERSION="$INSTALL_OCP_VERSION" -e INSTALL_STEP="${{ matrix.step }}" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_PORT="$PROVISION_PORT" -e PROVISION_KUBEADMIN_PASSWORD_PATH="$PROVISION_KUBEADMIN_PASSWORD_PATH" -e PROVISION_KUBECONFIG_PATH="$PROVISION_KUBECONFIG_PATH" -e PROVISION_INSTALLER_PATH="$PROVISION_INSTALLER_PATH" -e PROVISION_INSTALLER_CMD="$PROVISION_INSTALLER_CMD" -e PROVISION_INSTALLER_LOG="$PROVISION_INSTALLER_LOG" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "/$RUNNER_PATH/.ssh/config":"/$PROVISION_USER/.ssh/config" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: ${{ matrix.step }} >>>>>>>>>>>>>>>>>>>>>>>>>>>>' - name: ▶ Rerun OCP assisted install after failure env: INSTALL_OCP_VERSION: "latest-4.16" OCP_CLIENT_VERSION: "4.16.0" IBM_API_KEY: ${{ secrets.IBM_API_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }} PROVISION_IP: ${{ secrets.PERF_PROVISION_IP }} PROVISION_USER: ${{ secrets.PERF_PROVISION_USER }} @@ -101,8 +101,8 @@ jobs: build=$(pip freeze | grep benchmark-runner | sed 's/==/=/g') build_version="$(cut -d'=' -f2 <<<"$build")" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP start step: run_ibm_ocp_installer >>>>>>>>>>>>>>>>>>>>>>>>>>>>' - podman run --rm -e OCP_ENV_FLAVOR="PERF" -e IBM_API_KEY="$IBM_API_KEY" -e GITHUB_TOKEN="$GITHUB_TOKEN" -e INSTALL_OCP_VERSION="$INSTALL_OCP_VERSION" -e INSTALL_STEP="run_ibm_ocp_installer" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_PORT="$PROVISION_PORT" -e PROVISION_KUBEADMIN_PASSWORD_PATH="$PROVISION_KUBEADMIN_PASSWORD_PATH" -e PROVISION_KUBECONFIG_PATH="$PROVISION_KUBECONFIG_PATH" -e PROVISION_INSTALLER_PATH="$PROVISION_INSTALLER_PATH" -e PROVISION_INSTALLER_CMD="$PROVISION_INSTALLER_CMD" -e PROVISION_INSTALLER_LOG="$PROVISION_INSTALLER_LOG" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "/$RUNNER_PATH/.ssh/config":"/$PROVISION_USER/.ssh/config" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" + podman run --rm -e OCP_ENV_FLAVOR="PERF" -e IBM_API_KEY="$IBM_API_KEY" -e GIT_TOKEN="$GIT_TOKEN" -e INSTALL_OCP_VERSION="$INSTALL_OCP_VERSION" -e INSTALL_STEP="run_ibm_ocp_installer" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_PORT="$PROVISION_PORT" -e PROVISION_KUBEADMIN_PASSWORD_PATH="$PROVISION_KUBEADMIN_PASSWORD_PATH" -e PROVISION_KUBECONFIG_PATH="$PROVISION_KUBECONFIG_PATH" -e PROVISION_INSTALLER_PATH="$PROVISION_INSTALLER_PATH" -e PROVISION_INSTALLER_CMD="$PROVISION_INSTALLER_CMD" -e PROVISION_INSTALLER_LOG="$PROVISION_INSTALLER_LOG" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" -v "/$RUNNER_PATH/.ssh/config":"/$PROVISION_USER/.ssh/config" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: run_ibm_ocp_installer >>>>>>>>>>>>>>>>>>>>>>>>>>>>' echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP start step: verify_ibm_install_complete >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' - podman run --rm -e OCP_ENV_FLAVOR="PERF" -e IBM_API_KEY="$IBM_API_KEY" -e GITHUB_TOKEN="$GITHUB_TOKEN" -e INSTALL_OCP_VERSION="$INSTALL_OCP_VERSION" -e INSTALL_STEP="verify_ibm_install_complete" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_PORT="$PROVISION_PORT" -e PROVISION_KUBEADMIN_PASSWORD_PATH="$PROVISION_KUBEADMIN_PASSWORD_PATH" -e PROVISION_KUBECONFIG_PATH="$PROVISION_KUBECONFIG_PATH" -e PROVISION_INSTALLER_PATH="$PROVISION_INSTALLER_PATH" -e PROVISION_INSTALLER_CMD="$PROVISION_INSTALLER_CMD" -e PROVISION_INSTALLER_LOG="$PROVISION_INSTALLER_LOG" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" + podman run --rm -e OCP_ENV_FLAVOR="PERF" -e IBM_API_KEY="$IBM_API_KEY" -e GIT_TOKEN="$GIT_TOKEN" -e INSTALL_OCP_VERSION="$INSTALL_OCP_VERSION" -e INSTALL_STEP="verify_ibm_install_complete" -e WORKER_IDS="$WORKER_IDS" -e PROVISION_IP="$PROVISION_IP" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e CONTAINER_PRIVATE_KEY_PATH="$CONTAINER_PRIVATE_KEY_PATH" -e PROVISION_USER="$PROVISION_USER" -e PROVISION_PORT="$PROVISION_PORT" -e PROVISION_KUBEADMIN_PASSWORD_PATH="$PROVISION_KUBEADMIN_PASSWORD_PATH" -e PROVISION_KUBECONFIG_PATH="$PROVISION_KUBECONFIG_PATH" -e PROVISION_INSTALLER_PATH="$PROVISION_INSTALLER_PATH" -e PROVISION_INSTALLER_CMD="$PROVISION_INSTALLER_CMD" -e PROVISION_INSTALLER_LOG="$PROVISION_INSTALLER_LOG" -e GITHUB_REPOSITORY_SHORT="$GITHUB_REPOSITORY_SHORT" -e PROVISION_TIMEOUT="3600" -e log_level="INFO" -v "$PROVISION_PRIVATE_KEY_PATH":"$CONTAINER_PRIVATE_KEY_PATH" --privileged "${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> OCP end step: verify_ibm_install_complete >>>>>>>>>>>>>>>>>>>>>>>>>>>>' diff --git a/.github/workflows/Weekly_Perf_Env_Operator_CI.yml b/.github/workflows/Weekly_Perf_Env_Operator_CI.yml index d488cf9b8..24f764467 100644 --- a/.github/workflows/Weekly_Perf_Env_Operator_CI.yml +++ b/.github/workflows/Weekly_Perf_Env_Operator_CI.yml @@ -84,7 +84,7 @@ jobs: QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} IBM_API_KEY: ${{ secrets.IBM_API_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} WORKER_IDS: ${{ secrets.PERF_WORKER_IDS }} PROVISION_IP: ${{ secrets.PERF_PROVISION_IP }} PROVISION_USER: ${{ secrets.PERF_PROVISION_USER }} @@ -119,7 +119,7 @@ jobs: # Run operator on provision machine scp -r "$RUNNER_PATH/private_key.txt" provision:"$CONTAINER_PRIVATE_KEY_PATH" scp -r "$RUNNER_PATH/.kube/config" provision:"$CONTAINER_KUBECONFIG_PATH" - echo -e "podman run --rm -e IBM_API_KEY=$IBM_API_KEY -e GITHUB_TOKEN=$GITHUB_TOKEN -e KUBEADMIN_PASSWORD=$KUBEADMIN_PASSWORD -e INSTALL_OCP_RESOURCES=True -e CNV_VERSION=$CNV_VERSION -e QUAY_USERNAME=$QUAY_USERNAME -e QUAY_PASSWORD=$QUAY_PASSWORD -e ODF_VERSION=$ODF_VERSION -e KATA_CSV=$KATA_CSV -e NUM_ODF_DISK=$NUM_ODF_DISK -e INSTALL_RESOURCES_LIST=${{ matrix.resource }} -e WORKER_IDS=$WORKER_IDS -e PROVISION_IP=$PROVISION_IP -e CONTAINER_PRIVATE_KEY_PATH=$CONTAINER_PRIVATE_KEY_PATH -e PROVISION_USER=$PROVISION_USER -e PROVISION_OC_USER=$PROVISION_OC_USER -e PROVISION_PORT=$PROVISION_PORT -e GITHUB_REPOSITORY_SHORT=$GITHUB_REPOSITORY_SHORT -e WORKER_DISK_IDS=$WORKER_DISK_IDS -e WORKER_DISK_PREFIX=$WORKER_DISK_PREFIX -e EXPECTED_NODES=$EXPECTED_NODES -e PROVISION_TIMEOUT=3600 -e log_level=INFO -v $CONTAINER_PRIVATE_KEY_PATH:$CONTAINER_PRIVATE_KEY_PATH -v $CONTAINER_KUBECONFIG_PATH:$CONTAINER_KUBECONFIG_PATH --privileged ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" > "$RUNNER_PATH/install_operator.sh" + echo -e "podman run --rm -e IBM_API_KEY=$IBM_API_KEY -e GIT_TOKEN=$GIT_TOKEN -e KUBEADMIN_PASSWORD=$KUBEADMIN_PASSWORD -e INSTALL_OCP_RESOURCES=True -e CNV_VERSION=$CNV_VERSION -e QUAY_USERNAME=$QUAY_USERNAME -e QUAY_PASSWORD=$QUAY_PASSWORD -e ODF_VERSION=$ODF_VERSION -e KATA_CSV=$KATA_CSV -e NUM_ODF_DISK=$NUM_ODF_DISK -e INSTALL_RESOURCES_LIST=${{ matrix.resource }} -e WORKER_IDS=$WORKER_IDS -e PROVISION_IP=$PROVISION_IP -e CONTAINER_PRIVATE_KEY_PATH=$CONTAINER_PRIVATE_KEY_PATH -e PROVISION_USER=$PROVISION_USER -e PROVISION_OC_USER=$PROVISION_OC_USER -e PROVISION_PORT=$PROVISION_PORT -e GITHUB_REPOSITORY_SHORT=$GITHUB_REPOSITORY_SHORT -e WORKER_DISK_IDS=$WORKER_DISK_IDS -e WORKER_DISK_PREFIX=$WORKER_DISK_PREFIX -e EXPECTED_NODES=$EXPECTED_NODES -e PROVISION_TIMEOUT=3600 -e log_level=INFO -v $CONTAINER_PRIVATE_KEY_PATH:$CONTAINER_PRIVATE_KEY_PATH -v $CONTAINER_KUBECONFIG_PATH:$CONTAINER_KUBECONFIG_PATH --privileged ${{ secrets.QUAY_BENCHMARK_RUNNER_REPOSITORY }}" > "$RUNNER_PATH/install_operator.sh" scp -r "$RUNNER_PATH/install_operator.sh" provision:"/tmp/install_operator.sh" ssh -t provision "chmod +x /tmp/install_operator.sh;/tmp/./install_operator.sh;rm -f /tmp/install_operator.sh" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> End ${{ matrix.resource }} installation >>>>>>>>>>>>>>>>>>>>>>>>>>>>' diff --git a/benchmark_runner/common/github/github_operations.py b/benchmark_runner/common/github/github_operations.py index 626d53620..e3a12bf00 100644 --- a/benchmark_runner/common/github/github_operations.py +++ b/benchmark_runner/common/github/github_operations.py @@ -13,8 +13,8 @@ class GitHubOperations: def __init__(self): self.__environment_variables_dict = environment_variables.environment_variables_dict - github_token = self.__environment_variables_dict.get('github_token', '') - self.g = Github(github_token) + git_token = self.__environment_variables_dict.get('git_token', '') + self.g = Github(git_token) self.repo = self.g.get_repo(self.__environment_variables_dict.get('github_repository_short', '')) @typechecked diff --git a/benchmark_runner/common/ocp_resources/create_ocp_resource.py b/benchmark_runner/common/ocp_resources/create_ocp_resource.py index ac7847d22..dc940a36e 100644 --- a/benchmark_runner/common/ocp_resources/create_ocp_resource.py +++ b/benchmark_runner/common/ocp_resources/create_ocp_resource.py @@ -27,7 +27,7 @@ def __init__(self): if self.__worker_disk_ids: if self.__worker_disk_ids: # Solved GitHub Actions issue that env variable detect as string instead of dict/ list -skip for Jenkins - if self.__environment_variables_dict.get('github_token', ''): + if self.__environment_variables_dict.get('git_token', ''): self.__worker_disk_ids = self.__worker_disk_ids.replace('"', '') self.__worker_disk_ids = ast.literal_eval(self.__worker_disk_ids) diff --git a/benchmark_runner/main/environment_variables.py b/benchmark_runner/main/environment_variables.py index af1f776ff..d57271541 100644 --- a/benchmark_runner/main/environment_variables.py +++ b/benchmark_runner/main/environment_variables.py @@ -260,7 +260,7 @@ def __init__(self): # IBM data self._environment_variables_dict['ibm_api_key'] = EnvironmentVariables.get_env('IBM_API_KEY', '') # GitHub token - self._environment_variables_dict['github_token'] = EnvironmentVariables.get_env('GITHUB_TOKEN', '') + self._environment_variables_dict['git_token'] = EnvironmentVariables.get_env('GIT_TOKEN', '') self._environment_variables_dict['worker_ids'] = EnvironmentVariables.get_env(f'WORKER_IDS', "") self._environment_variables_dict['provision_ip'] = EnvironmentVariables.get_env(f'PROVISION_IP', '') # Placed on secret only