sts-sponsors team mailing list archive

[Jack Lloyd-Walters <mp+439088@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/jenkins/jobs/ansible_playbook.groovy b/jenkins/jobs/ansible_playbook.groovy
> index 507085b..22870b6 100644
> --- a/jenkins/jobs/ansible_playbook.groovy
> +++ b/jenkins/jobs/ansible_playbook.groovy
> @@ -34,21 +34,43 @@ pipeline {
>          stage('Fetch commit sha') {
>              steps {
>                  script {
> -                    env.COMMIT_SHA = sh(script: "git ls-remote ${params.ANSIBLE_REPO} ${params.ANSIBLE_BRANCH} | awk \'{print \$1}\'", returnStdout: true).trim()
> +                    env.COMMIT_SHA = sh(script: "git ls-remote ${params.GITHUB_REPO} ${params.GITHUB_BRANCH} | awk \'{print \$1}\'", returnStdout: true).trim()
>                      println "commit: ${env.COMMIT_SHA}"
>                  }
> -                updateCommitStatus("${params.MAIN_REPO}", "${env.COMMIT_SHA}", "PENDING", "Pending test execution")
> +                updateCommitStatus("${params.TARGET_REPO}", "${env.COMMIT_SHA}", "PENDING", "Tests Executing, Awaiting results")
>              }
>          }
>          stage('System Tests') {
>              steps {
>                  writeFile file: 'system-tests/config.yaml', text: """
> +                networks:
> +                    pxe:
> +                        cidr: 10.0.2.0/24
> +                        bridge: net-test
> +                        dynamic:
> +                            start: 10.0.2.20
> +                            end: 10.0.2.100
> +                        reserved:
> +                            - start: 10.0.2.1
> +                              end: 10.0.2.19
> +                              comment: Reserved
> +                            - start: 10.0.2.101
> +                              end: 10.0.2.200
> +                              comment: BMCs
> +                maas:
> +                    networks:
> +                        pxe: 10.0.2.2
> +                    config:
> +                        upstream_dns: 8.8.8.8
> +                        dnssec_validation: "no"
> +                    domain_name: systemtestsmaas

This was from another change I was making to the system tests to use a running maas, should be split into another MP later on actually, so that's a good point

>                  proxy:
>                      http: http://squid.internal:3128
>                  containers-image: ${params.CONTAINERS_IMAGE}
>                  ansible-playbooks:
> -                    git-repo: ${params.ANSIBLE_REPO}
> -                    git-branch: ${params.ANSIBLE_BRANCH}
> +                    git-repo: ${params.GITHUB_REPO}
> +                    git-branch: ${params.GITHUB_BRANCH}
> +                    verbosity: ${DEBUG_LEVEL}
>                  """
>                  dir("system-tests") {
>                      sh """
> diff --git a/jenkins/jobs/gh_repo_tester.groovy b/jenkins/jobs/gh_repo_tester.groovy
> index 4e39a32..1015a5f 100644
> --- a/jenkins/jobs/gh_repo_tester.groovy
> +++ b/jenkins/jobs/gh_repo_tester.groovy
> @@ -78,7 +104,7 @@ pipeline {
>          stage("Fetch Pull Requests") {
>              steps {
>                  script {
> -                    split_repo_url = "${params.MAIN_REPO}".split("/")
> +                    split_repo_url = "${params.TARGET_REPO}".split("/")

Yeah I think it can, will change

>                      repo_name = split_repo_url[split_repo_url.length-1]
>                      user_name = split_repo_url[split_repo_url.length-2]
>                      output = sh(script: "curl -s https://api.github.com/repos/${user_name}/${repo_name}/pulls?state=open";, returnStdout: true).trim()


-- 
https://code.launchpad.net/~maas-committers/maas-ci/+git/maas-ci-config/+merge/439088
Your team MAAS Committers is subscribed to branch ~maas-committers/maas-ci/+git/maas-ci-config:master.