diff options
| -rw-r--r-- | jjb/integration/integration-ieft-actn-tools.yaml | 32 | ||||
| -rw-r--r-- | jjb/integration/simulators/integration-ran-nssmf-simulator.yaml | 32 | ||||
| -rw-r--r-- | packer/provision/helm.yaml | 40 |
3 files changed, 101 insertions, 3 deletions
diff --git a/jjb/integration/integration-ieft-actn-tools.yaml b/jjb/integration/integration-ieft-actn-tools.yaml index e635ce11f..264ecdd16 100644 --- a/jjb/integration/integration-ieft-actn-tools.yaml +++ b/jjb/integration/integration-ieft-actn-tools.yaml @@ -12,3 +12,35 @@ build-node: centos7-builder-2c-1g jobs: - gerrit-info-yaml-verify + +- project: + name: integration-ieft-actn-tools-linters + project: integration/ieft-actn-tools + project-name: integration-ieft-actn-tools + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml index 5b9a661fd..f31dd1d7d 100644 --- a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml @@ -12,3 +12,35 @@ build-node: centos7-builder-2c-1g jobs: - gerrit-info-yaml-verify + +- project: + name: integration-simulators-ran-nssmf-simulator-linters + project: integration/simulators/ran-nssmf-simulator + project-name: integration-simulators-ran-nssmf-simulator + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index 459fbb1fc..a5f6ba2ed 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -8,7 +8,8 @@ vars: kubectl_version: 1.15.11 helm_version: 2.16.6 - helm3_version: 3.3.4 + helm3_3_version: 3.3.4 + helm3_version: 3.5.1 chartmuseum_version: 0.12.0 tasks: @@ -37,6 +38,39 @@ - name: 'Check helm.' command: 'which helm' + - name: 'Install Helm 3.3 {{helm3_3_version}}' + block: + - name: create directory + file: + path: /tmp/helm3 + state: directory + - name: 'Fetch tar.gz' + get_url: + url: "https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3_3 + - name: 'Unarchive' + unarchive: + src: "/tmp/helm3_3/helm-v{{helm3_3_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3_3 + remote_src: true + become: yes + - name: 'Move helm to /usr/local/bin and set as executable' + command: 'mv /tmp/helm3_3/linux-amd64/helm /usr/local/bin/helm3.3' + become: yes + - name: 'Check helm3.' + command: 'which helm3' + - name: 'Check kubectl.' + command: 'which kubectl' + + - name: Install helm 3.3 + shell: | + echo "----> Installing helm 3.3" + wget 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz' + tar -xvf 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz' + mv linux-amd64/helm /usr/local/bin/helm3.3 + which helm3.3 + become: true + - name: 'Install Helm3 {{helm3_version}}' block: - name: create directory @@ -64,8 +98,8 @@ - name: Install helm3 shell: | echo "----> Installing helm3" - wget 'https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz' - tar -xvf 'https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz' + wget 'https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz' + tar -xvf 'https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz' mv linux-amd64/helm /usr/local/bin/helm3 which helm3 become: true |